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

[jmr at macports.org]

Revision: 138749
          https://trac.macports.org/changeset/138749
Author:   jmr at macports.org
Date:     2015-07-17 21:26:01 -0700 (Fri, 17 Jul 2015)
Log Message:
-----------
reword variant mismatch message to make it clearer what is going on, and remove advice to use -f (it's not safe in general, and those sufficiently clueful to use it safely don't need to be told about it)

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

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2015-07-18 01:43:44 UTC (rev 138748)
+++ trunk/base/src/port1.0/portutil.tcl	2015-07-18 04:26:01 UTC (rev 138749)
@@ -2126,8 +2126,8 @@
 
         array set oldvariations {}
         if {[check_statefile_variants variations oldvariations $state_fd]} {
-            ui_error "Requested variants \"[canonicalize_variants [array get variations]]\" do not match original selection \"[canonicalize_variants [array get oldvariations]]\"."
-            ui_error "Please use the same variants again, perform 'port clean [option subport]' or specify the force option (-f)."
+            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
         } elseif {![tbool ports_dryrun]} {
             # Write variations out to the statefile
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150717/8383b415/attachment.html>