[24882] branches/dp2mp-move/base/src/port1.0/portutil.tcl

[source_changes at macosforge.org]

Revision: 24882
          http://trac.macosforge.org/projects/macports/changeset/24882
Author:   jmpp at macports.org
Date:     2007-05-06 23:14:26 -0700 (Sun, 06 May 2007)

Log Message:
-----------
Merging jberry's r24855: Ignore variant mismatch for not just clean target, but also submit target.

Modified Paths:
--------------
    branches/dp2mp-move/base/src/port1.0/portutil.tcl

Modified: branches/dp2mp-move/base/src/port1.0/portutil.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/portutil.tcl	2007-05-07 06:11:21 UTC (rev 24881)
+++ branches/dp2mp-move/base/src/port1.0/portutil.tcl	2007-05-07 06:14:26 UTC (rev 24882)
@@ -1406,24 +1406,25 @@
     # If they don't match, print an error indicating a 'port clean' 
     # should be performed.  
     # - Skip this test if the statefile is empty.
-    # - Skip this test if performing a clean.
+    # - Skip this test if performing a clean or submit.
     # - Skip this test if ports_force was specified.
     
-    if {$target != "clean" && 
-	!([info exists ports_force] && $ports_force == "yes")} {
-	set state_fd [open_statefile]
+    if { [lsearch "clean submit" $target] < 0 && 
+		!([info exists ports_force] && $ports_force == "yes")} {
+		
+		set state_fd [open_statefile]
 	
-	if {[check_statefile_variants upvariations $state_fd]} {
-	    ui_error "Requested variants do not match original selection.\nPlease perform 'port clean $portname' or specify the force option."
-	    set result 1
-	} else {
-	    # Write variations out to the statefile
-	    foreach key [array names upvariations *] {
-		write_statefile variant $upvariations($key)$key $state_fd
-	    }
-	}
-	
-	close $state_fd
+		if {[check_statefile_variants upvariations $state_fd]} {
+			ui_error "Requested variants do not match original selection.\nPlease perform 'port clean $portname' or specify the force option."
+			set result 1
+		} else {
+			# Write variations out to the statefile
+			foreach key [array names upvariations *] {
+			write_statefile variant $upvariations($key)$key $state_fd
+			}
+		}
+		
+		close $state_fd
     }
     
     return $result

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070506/2d4a355d/attachment.html