Changeset 25033

Timestamp:

2007-05-11 23:17:27 (19 months ago)

Author:

eridius@…

Message:

Evaluate variants during dportopen instead of dportexec.
This ensures that querying an open port always contains the proper variant-modified information before any targets are executed.
It also prevents variants from being executed multiple times if multiple targets are executed separately (fixes #11296).

Location:

trunk/base

Files:

• ChangeLog (modified) (1 diff)
• src/darwinports1.0/darwinports.tcl (modified) (3 diffs)
• src/port1.0/portutil.tcl (modified) (2 diffs)

trunk/base/ChangeLog

@@ -6 +6 @@
 
 (unreleased):
+
+    - Evaluate variants at dportopen instead of dportexec. This ensures that
+      the portfile represents the proper information if queried before targets
+      are executed. It also prevents variants from being executed twice if multiple
+      targets are executed separately on the portfile (ticket #11296, eridius r25033).
 
     - Fix copy and move commands (eridius r25024).

trunk/base/src/darwinports1.0/darwinports.tcl

@@ -814 +814 @@
 
     $workername eval source Portfile
+    
+    # evaluate the variants
+        if {[$workername eval eval_variants variations] != 0} {
+            dportclose $dport
+                error "Error evaluating variants"
+        }
 
     ditem_key $dport provides [$workername eval return \$portname]
@@ -1035 +1041 @@
         # xxx: set the work path?
         set workername [ditem_key $dport workername]
-        if {![catch {$workername eval eval_variants variations $target} result] && $result == 0 &&
+        if {![catch {$workername eval check_variants variations $target} result] && $result == 0 &&
                 ![catch {$workername eval eval_targets $target} result] && $result == 0} {
                 # If auto-clean mode, clean-up after dependency install
@@ -1062 +1068 @@
 
         set workername [ditem_key $dport workername]
-
-        # XXX: move this into dportopen?
-        if {[$workername eval eval_variants variations $target] != 0} {
+        
+        # check variants
+        if {[$workername eval check_variants variations $target] != 0} {
                 return 1
         }

trunk/base/src/port1.0/portutil.tcl

@@ -1366 +1366 @@
 }
 
-proc eval_variants {variations target} {
+proc eval_variants {variations} {
     global all_variants ports_force PortInfo
     set dlist $all_variants
-    set result 0
     upvar $variations upvariations
     set chosen [choose_variants $dlist upvariations]
@@ -1400 +1399 @@
                 return 1
     }
+    
+    return 0
+}
+
+proc check_variants {variations target} {
+    global ports_force PortInfo
+    upvar $variations upvariations
+    set result 0
+    set portname $PortInfo(name)
     
     # Make sure the variations match those stored in the statefile.