[118640] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 118640
          https://trac.macports.org/changeset/118640
Author:   jmr at macports.org
Date:     2014-04-06 08:40:46 -0700 (Sun, 06 Apr 2014)
Log Message:
-----------
handle recursive invocation of mportopen_installed

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2014-04-06 14:12:40 UTC (rev 118639)
+++ trunk/base/src/macports1.0/macports.tcl	2014-04-06 15:40:46 UTC (rev 118640)
@@ -1726,18 +1726,20 @@
     foreach v $minusvariant {
         lappend variations $v -
     }
-    lappend options subport $name
 
+    array set options_array $options
+    set options_array(subport) $name
+
     # find portgroups in registry
     set pgdirlist [list]
     foreach pg [$regref groups_used] {
         lappend pgdirlist [file join ${registry.path} registry portgroups [$pg sha256]-[$pg size]]
     }
     if {$pgdirlist ne {}} {
-        lappend options _portgroup_search_dirs [list $pgdirlist]
+        set options_array(_portgroup_search_dirs) [list $pgdirlist]
     }
 
-    return [mportopen file://${portfile_dir}/ $options $variations]
+    return [mportopen file://${portfile_dir}/ [array get options_array] $variations]
 }
 
 # Traverse a directory with ports, calling a function on the path of ports
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140406/791f0721/attachment.html>