<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.8
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/e2750248bed98ca8886ee3c3d2d434da8020e025">https://github.com/macports/macports-base/commit/e2750248bed98ca8886ee3c3d2d434da8020e025</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/release-2.8 by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e2750248b Skip renaming on extract if worksrcpath exists
</span>e2750248b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e2750248bed98ca8886ee3c3d2d434da8020e025
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jan 13 12:15:08 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> Skip renaming on extract if worksrcpath exists
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit d43dd953c6b0ff9e9b0bb0c18c8e6c1da17f9617)
</span>---
src/port1.0/portextract.tcl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portextract.tcl b/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 1629d0e85..760e9f4e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +158,7 @@ proc portextract::extract_main {args} {
</span> chownAsRoot ${extract.dir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option extract.rename]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option extract.rename] && ![file exists [option worksrcpath]]} {
</span> global workpath distname
# rename whatever directory exists in $workpath to $distname
set worksubdirs [glob -nocomplain -types d -directory $workpath *]
</pre><pre style='margin:0'>
</pre>