Ignore:
Timestamp:
May 6, 2007, 3:46:11 PM (11 years ago)
Author:
jberry@…
Message:

Ignore variant mismatch for not just clean target, but also submit target

File:
1 edited

Legend:

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

    r24678 r24855  
    14071407    # should be performed. 
    14081408    # - Skip this test if the statefile is empty.
    1409     # - Skip this test if performing a clean.
     1409    # - Skip this test if performing a clean or submit.
    14101410    # - Skip this test if ports_force was specified.
    14111411   
    1412     if {$target != "clean" &&
    1413         !([info exists ports_force] && $ports_force == "yes")} {
    1414         set state_fd [open_statefile]
    1415        
    1416         if {[check_statefile_variants upvariations $state_fd]} {
    1417             ui_error "Requested variants do not match original selection.\nPlease perform 'port clean $portname' or specify the force option."
    1418             set result 1
    1419         } else {
    1420             # Write variations out to the statefile
    1421             foreach key [array names upvariations *] {
    1422                 write_statefile variant $upvariations($key)$key $state_fd
    1423             }
    1424         }
    1425        
    1426         close $state_fd
     1412    if { [lsearch "clean submit" $target] < 0 &&
     1413                !([info exists ports_force] && $ports_force == "yes")} {
     1414               
     1415                set state_fd [open_statefile]
     1416       
     1417                if {[check_statefile_variants upvariations $state_fd]} {
     1418                        ui_error "Requested variants do not match original selection.\nPlease perform 'port clean $portname' or specify the force option."
     1419                        set result 1
     1420                } else {
     1421                        # Write variations out to the statefile
     1422                        foreach key [array names upvariations *] {
     1423                        write_statefile variant $upvariations($key)$key $state_fd
     1424                        }
     1425                }
     1426               
     1427                close $state_fd
    14271428    }
    14281429   
Note: See TracChangeset for help on using the changeset viewer.