Changeset 58980


Ignore:
Timestamp:
Oct 8, 2009, 3:55:59 AM (11 years ago)
Author:
snc@…
Message:

add build_arch to clean (--archive) to match updated archive path

File:
1 edited

Legend:

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

    r54673 r58980  
    5959    global UI_PREFIX
    6060    global ports_clean_dist ports_clean_work ports_clean_archive
    61     global ports_clean_all usealtworkpath
     61    global ports_clean_all usealtworkpath 
    6262
    6363    if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \
     
    201201proc portclean::clean_archive {args} {
    202202    global workpath portarchivepath name version ports_version_glob
     203    global configure.build_arch
    203204
    204205    # Define archive destination directory and target filename
    205206    if {$portarchivepath ne $workpath && $portarchivepath ne ""} {
    206         set archivepath [file join $portarchivepath [option os.platform] [option os.arch]]
     207        set archivepath [file join $portarchivepath [option os.platform] ${configure.build_arch}]
    207208    }
    208209
     
    210211        # Match all possible archive variatns that match the version
    211212        # glob specified by the user for this OS.
    212         set fileglob "$name-[option ports_version_glob]*.[option os.arch].*"
     213        set fileglob "$name-[option ports_version_glob]*.${configure.build_arch}.*"
    213214    } else {
    214215        # Match all possible archive variants for the current version on
     
    219220        # first part of the name (e.g. trying to remove foo-*, it will
    220221        # pick up anything foo-bar-* as well, which is undesirable).
    221         set fileglob "$name-$version*.[option os.arch].*"
     222        set fileglob "$name-$version*.${configure.build_arch}.*"
    222223    }
    223224
     
    229230            # Make sure file is truly a port archive file, and not
    230231            # and accidental match with some other file that might exist.
    231             if {[regexp "^$name-\[-_a-zA-Z0-9\.\]+_\[0-9\]*\[+-_a-zA-Z0-9\]*\[\.\][option os.arch]\[\.\]\[a-z2\]+\$" $file]} {
     232            if {[regexp "^$name-\[-_a-zA-Z0-9\.\]+_\[0-9\]*\[+-_a-zA-Z0-9\]*\[\.\]${configure.build_arch}\[\.\]\[a-z2\]+\$" $file]} {
    232233                if {[file isfile $path]} {
    233234                    ui_debug "Removing archive: $path"
Note: See TracChangeset for help on using the changeset viewer.