<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/db2bba84d5e8cd82ec94a19129deb91ef62287bb">https://github.com/macports/macports-base/commit/db2bba84d5e8cd82ec94a19129deb91ef62287bb</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 db2bba8 portutil.tcl: Fix renames that supply the -force option
</span>db2bba8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit db2bba84d5e8cd82ec94a19129deb91ef62287bb
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Dec 13 10:23:47 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> portutil.tcl: Fix renames that supply the -force option
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Treat $options as a list not as a string.
</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/55492
</span>---
src/port1.0/portutil.tcl | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f8ca01..e5e32ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1164,12 +1164,12 @@ proc move {args} {
</span> set arg [string range [lindex $args 0] 1 end]
set args [lreplace $args 0 0]
switch -- $arg {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- force {append options -$arg}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ force {lappend options -$arg}
</span> - break
default {return -code error "move: illegal option -- $arg"}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- append options --
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend options --
</span> if {[llength $args] == 2} {
set oldname [lindex $args 0]
set newname [lindex $args 1]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1177,13 +1177,13 @@ proc move {args} {
</span> # case-only rename
set tempdir [mkdtemp ${oldname}-XXXXXXXX]
set tempname $tempdir/[file tail $oldname]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename $options $oldname $tempname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename $options $tempname $newname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename {*}$options $oldname $tempname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename {*}$options $tempname $newname
</span> delete $tempdir
return
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename $options {*}$args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename {*}$options {*}$args
</span> }
# ln
</pre><pre style='margin:0'>
</pre>