[118686] branches/release_2_3

jmr at macports.org jmr at macports.org
Mon Apr 7 20:28:12 PDT 2014


Revision: 118686
          https://trac.macports.org/changeset/118686
Author:   jmr at macports.org
Date:     2014-04-07 20:28:12 -0700 (Mon, 07 Apr 2014)
Log Message:
-----------
merge r118640 from trunk:
 handle recursive invocation of mportopen_installed

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

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

Property Changed:
----------------
    branches/release_2_3/
    branches/release_2_3/base/


Property changes on: branches/release_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:118056,118161
   + /trunk:118056,118161,118640


Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118598-118599,118602-118603,118606-118607
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118598-118599,118602-118603,118606-118607,118640
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_3/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_3/base/src/macports1.0/macports.tcl	2014-04-08 03:26:48 UTC (rev 118685)
+++ branches/release_2_3/base/src/macports1.0/macports.tcl	2014-04-08 03:28:12 UTC (rev 118686)
@@ -1728,18 +1728,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/20140407/75d52b30/attachment.html>


More information about the macports-changes mailing list