Revision
140690
Author
jmr@macports.org
Date
2015-09-29 23:31:15 -0700 (Tue, 29 Sep 2015)

Log Message

merge r138749 from trunk:
 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

Property Changed

Diff

Property changes: branches/release_2_3

Modified: svn:mergeinfo

+ /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868,126900,128113,128274,128276,128422,136965,137850,138461,138749

Property changes: branches/release_2_3/base

Modified: svn:mergeinfo

/branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,136965,137850,138461,138530 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,136965,137850,138461,138530,138749 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692

Property changes: branches/release_2_3/base/src

Modified: svn:mergeinfo

/branches/gsoc09-logging/base/src:51231-60371 /branches/gsoc11-rev-upgrade/base/src:78828-88375 /branches/gsoc11-statistics/base/src:79520,79666 /branches/gsoc13-tests/src:106692-111324 /branches/universal-sanity/base/src:51872-52323 /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851,136965,137850,138461,138530 /users/perry/base-bugs_and_notes/src:45682-46060 /users/perry/base-select/src:44044-44692 + /branches/gsoc08-privileges/base/src:37343-46937 /branches/gsoc09-logging/base/src:51231-60371 /branches/gsoc11-rev-upgrade/base/src:78828-88375 /branches/gsoc11-statistics/base/src:79520,79666 /branches/gsoc13-tests/src:106692-111324 /branches/universal-sanity/base/src:51872-52323 /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851,136965,137850,138461,138530,138749 /users/perry/base-bugs_and_notes/src:45682-46060 /users/perry/base-select/src:44044-44692

Modified: branches/release_2_3/base/src/port1.0/portutil.tcl (140689 => 140690)


--- branches/release_2_3/base/src/port1.0/portutil.tcl	2015-09-30 06:27:47 UTC (rev 140689)
+++ branches/release_2_3/base/src/port1.0/portutil.tcl	2015-09-30 06:31:15 UTC (rev 140690)
@@ -2132,7 +2132,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]]\".\nPlease 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 {!([info exists ports_dryrun] && $ports_dryrun eq "yes")} {
             # Write variations out to the statefile