[96538] trunk/base/src/port1.0/portutil.tcl

[cal at macports.org]

Revision: 96538
          https://trac.macports.org/changeset/96538
Author:   cal at macports.org
Date:     2012-08-13 13:18:53 -0700 (Mon, 13 Aug 2012)
Log Message:
-----------
base: variant handling in statefiles: Assume the empty variant, if any target has been recorded in the file, #29223

Modified Paths:
--------------
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2012-08-13 20:09:53 UTC (rev 96537)
+++ trunk/base/src/port1.0/portutil.tcl	2012-08-13 20:18:53 UTC (rev 96538)
@@ -1827,15 +1827,19 @@
     array set upoldvariations {}
 
     set variants_found no
+    set targets_found no
     seek $fd 0
     while {[gets $fd line] >= 0} {
         if {[regexp "variant: (.*)" $line match name]} {
             set upoldvariations([string range $name 1 end]) [string range $name 0 0]
             set variants_found yes
         }
+        if {[regexp "target: .*" $line]} {
+            set targets_found yes
+        }
     }
 
-    if {![tbool variants_found]} {
+    if {![tbool variants_found] && ![tbool targets_found]} {
         # Statefile is "empty", skipping further tests
         return 0
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120813/cbef0509/attachment.html>