[101268] branches/release_2_1

jmr at macports.org jmr at macports.org
Mon Jan 7 06:18:10 PST 2013 

Revision: 101268
          https://trac.macports.org/changeset/101268
Author:   jmr at macports.org
Date:     2013-01-07 06:18:10 -0800 (Mon, 07 Jan 2013)
Log Message:
-----------
merge r100679 from trunk:
 save the original set of requested variations separately for mpkg's use, since eval_variants filters out variations for which the port doesn't have a corresponding variant (#36363)

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

Modified Paths:
--------------
    branches/release_2_1/base/src/package1.0/portmpkg.tcl
    branches/release_2_1/base/src/port1.0/portutil.tcl

Property Changed:
----------------
    branches/release_2_1/
    branches/release_2_1/base/
    branches/release_2_1/base/src/package1.0/


Property changes on: branches/release_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822,99857
   + /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822,99857,100679


Property changes on: branches/release_2_1/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/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:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,99857,100129,100217-100220
/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/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,99857,100129,100217-100220,100679
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692


Property changes on: branches/release_2_1/base/src/package1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/src/package1.0:37343-46937
/branches/gsoc09-logging/base/src/package1.0:51231-60371
/branches/gsoc11-rev-upgrade/base/src/package1.0:78828-88375
/branches/universal-sanity/base/src/package1.0:51872-52323
/branches/variant-descs-14482/base/src/package1.0:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/package1.0:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99167,100129,100217-100220
/users/perry/base-bugs_and_notes/src/package1.0:45682-46060
/users/perry/base-select/src/package1.0:44044-44692
   + /branches/gsoc08-privileges/base/src/package1.0:37343-46937
/branches/gsoc09-logging/base/src/package1.0:51231-60371
/branches/gsoc11-rev-upgrade/base/src/package1.0:78828-88375
/branches/universal-sanity/base/src/package1.0:51872-52323
/branches/variant-descs-14482/base/src/package1.0:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/package1.0:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99167,100129,100217-100220,100679
/users/perry/base-bugs_and_notes/src/package1.0:45682-46060
/users/perry/base-select/src/package1.0:44044-44692

Modified: branches/release_2_1/base/src/package1.0/portmpkg.tcl
===================================================================
--- branches/release_2_1/base/src/package1.0/portmpkg.tcl	2013-01-07 14:08:21 UTC (rev 101267)
+++ branches/release_2_1/base/src/package1.0/portmpkg.tcl	2013-01-07 14:18:10 UTC (rev 101268)
@@ -59,7 +59,7 @@
 }
 
 proc portmpkg::make_dependency_list {portname destination} {
-    global variations prefix package.destpath package.flat
+    global requested_variations prefix package.destpath package.flat
 	set result {}
 	if {[catch {set res [mport_lookup $portname]} error]} {
 		global errorInfo
@@ -73,7 +73,7 @@
 		set deprivileged 1
 	}
 
-	set mport [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${destination} package.flat ${package.flat} subport $portinfo(name)] [array get variations]]
+	set mport [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${destination} package.flat ${package.flat} subport $portinfo(name)] [array get requested_variations]]
 
     if {[info exists deprivileged]} {
 	    global macportsuser

Modified: branches/release_2_1/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_2_1/base/src/port1.0/portutil.tcl	2013-01-07 14:08:21 UTC (rev 101267)
+++ branches/release_2_1/base/src/port1.0/portutil.tcl	2013-01-07 14:18:10 UTC (rev 101268)
@@ -1938,7 +1938,7 @@
 }
 
 proc eval_variants {variations} {
-    global all_variants ports_force PortInfo portvariants negated_variants
+    global all_variants ports_force PortInfo requested_variations portvariants negated_variants
     set dlist $all_variants
     upvar $variations upvariations
     set chosen [choose_variants $dlist upvariations]
@@ -1949,6 +1949,8 @@
     # Check to make sure the requested variations are available with this
     # port, if one is not, warn the user and remove the variant from the
     # array.
+    # Save the originally requested set in requested_variations.
+    array set requested_variations [array get upvariations]
     foreach key [array names upvariations *] {
         if {![info exists PortInfo(variants)] ||
             [lsearch $PortInfo(variants) $key] == -1} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130107/c153c41d/attachment-0001.html>

More information about the macports-changes mailing list