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

[raimue at macports.org]

Revision: 145162
          https://trac.macports.org/changeset/145162
Author:   raimue at macports.org
Date:     2016-01-27 04:56:40 -0800 (Wed, 27 Jan 2016)
Log Message:
-----------
base: always write variant selection to statefile, even when running in force mode

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

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2016-01-27 12:34:54 UTC (rev 145161)
+++ trunk/base/src/port1.0/portutil.tcl	2016-01-27 12:56:40 UTC (rev 145162)
@@ -2115,12 +2115,12 @@
             break
         }
     }
-    if {$statereq && ![tbool ports_force]} {
+    if {$statereq} {
 
         set state_fd [open_statefile]
 
         array set oldvariations {}
-        if {[check_statefile_variants variations oldvariations $state_fd]} {
+        if {![tbool ports_force] && [check_statefile_variants variations oldvariations $state_fd]} {
             ui_error "Requested variants \"[canonicalize_variants [array get variations]]\" do not match those the build was started with: \"[canonicalize_variants [array get oldvariations]]\"."
             ui_error "Please use the same variants again, or run 'port clean [option subport]' first to remove the existing partially completed build."
             set result 1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160127/b08e3d81/attachment.html>