Changeset 138749 for trunk/base


Ignore:
Timestamp:
Jul 18, 2015, 4:26:01 AM (5 years ago)
Author:
jmr@…
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)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port1.0/portutil.tcl

    r138165 r138749  
    21272127        array set oldvariations {}
    21282128        if {[check_statefile_variants variations oldvariations $state_fd]} {
    2129             ui_error "Requested variants \"[canonicalize_variants [array get variations]]\" do not match original selection \"[canonicalize_variants [array get oldvariations]]\"."
    2130             ui_error "Please use the same variants again, perform 'port clean [option subport]' or specify the force option (-f)."
     2129            ui_error "Requested variants \"[canonicalize_variants [array get variations]]\" do not match those the build was started with: \"[canonicalize_variants [array get oldvariations]]\"."
     2130            ui_error "Please use the same variants again, or run 'port clean [option subport]' first to remove the existing partially completed build."
    21312131            set result 1
    21322132        } elseif {![tbool ports_dryrun]} {
Note: See TracChangeset for help on using the changeset viewer.