[136794] trunk/dports/_resources/port1.0/group/select-1.0.tcl

larryv at macports.org larryv at macports.org
Wed May 27 00:03:53 PDT 2015


Revision: 136794
          https://trac.macports.org/changeset/136794
Author:   larryv at macports.org
Date:     2015-05-27 00:03:53 -0700 (Wed, 27 May 2015)
Log Message:
-----------
select-1.0: Don't overwrite `name` (#47849)

Also rename some other common-word variables.

Bug introduced in r136723. I forgot that portfile options are visible as
global variables in pre/post scripts.

Revision Links:
--------------
    https://trac.macports.org/changeset/136723

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/select-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/select-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/select-1.0.tcl	2015-05-27 06:38:28 UTC (rev 136793)
+++ trunk/dports/_resources/port1.0/group/select-1.0.tcl	2015-05-27 07:03:53 UTC (rev 136794)
@@ -75,23 +75,23 @@
         select.entries-prepend [list ${select.group} ${select.file}]
     }
     ui_debug {PortGroup select: Installing select files to destroot}
-    foreach entry ${select.entries} {
-        set extras [lassign $entry group file name]
+    foreach selectEntry ${select.entries} {
+        set extras [lassign $selectEntry selectGroup selectFile selectName]
         if {[llength $extras] > 0} {
             ui_debug "PortGroup select:\
-                    Ignoring entry with too many elements: '$entry'"
+                    Ignoring entry with too many elements: '$selectEntry'"
             continue
         }
-        if {$group eq ""} {
+        if {$selectGroup eq ""} {
             ui_debug "PortGroup select:\
-                    Ignoring entry with missing group name: '$entry'"
+                    Ignoring entry with missing group name: '$selectEntry'"
             continue
         }
-        if {$file eq ""} {
+        if {$selectFile eq ""} {
             ui_debug "PortGroup select:\
-                    Ignoring entry with missing file name: '$entry'"
+                    Ignoring entry with missing file name: '$selectEntry'"
             continue
         }
-        select::install $group $file $name
+        select::install $selectGroup $selectFile $selectName
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150527/606aa09a/attachment-0001.html>


More information about the macports-changes mailing list