<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/b49168b9a911c904f55f7e721e1b0239a39f831e">https://github.com/macports/macports-base/commit/b49168b9a911c904f55f7e721e1b0239a39f831e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b49168b9a extract.rename improvements
</span>b49168b9a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b49168b9a911c904f55f7e721e1b0239a39f831e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jan 4 23:17:35 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> extract.rename improvements
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Rename to $distname instead of $worksrcdir as the latter may be set to
</span><span style='display:block; white-space:pre;color:#404040;'> a subdir. Don't try and fail to rename if the dir name is already
</span><span style='display:block; white-space:pre;color:#404040;'> correct.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/66415
</span>---
src/port1.0/portextract.tcl | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
<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 11a33b34b..1629d0e85 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;'>@@ -159,13 +159,16 @@ proc portextract::extract_main {args} {
</span> }
if {[option extract.rename]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global workpath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # rename whatever directory exists in $workpath to $worksrcdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global workpath distname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rename whatever directory exists in $workpath to $distname
</span> set worksubdirs [glob -nocomplain -types d -directory $workpath *]
if {[llength $worksubdirs] == 1} {
set origpath [lindex $worksubdirs 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug [format [msgcat::mc "extract.rename: Renaming %s -> %s"] [file tail $origpath] [option worksrcdir]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move $origpath [option worksrcpath]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set newpath [file join $workpath $distname]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$newpath ne $origpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug [format [msgcat::mc "extract.rename: Renaming %s -> %s"] [file tail $origpath] $distname]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move $origpath $newpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } elseif {[llength $worksubdirs] == 0} {
return -code error "extract.rename: no directories exist in $workpath"
} else {
</pre><pre style='margin:0'>
</pre>