Ignore:
Timestamp:
Jun 28, 2009, 9:26:50 PM (8 years ago)
Author:
blb@…
Message:

Merge from trunk

Location:
branches/images-and-archives/base
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/images-and-archives/base

  • branches/images-and-archives/base/src/registry1.0/receipt_flat.tcl

    r51515 r53051  
    7575    # regex match case
    7676    if {$portversion == 0} {
    77         set x [glob -nocomplain [file join ${macports::registry.path} receipts ${portname}-*]]
     77        set x [glob -nocomplain -directory [file join ${macports::registry.path} receipts] -- ${portname}-*]
    7878        if {[string length $x]} {
    7979            set matchfile [lindex $x 0]
     
    135135                        # xxx: We really should have had the version given to us, how
    136136                        # should we handle this?
    137                         set x [glob -nocomplain [file join ${receipt_path} *]]
     137                        set x [glob -nocomplain -directory ${receipt_path} *]
    138138                        if { [string length $x] } {
    139139                                set v [lindex [file split [lindex $x 0]] end]
     
    179179                set convertedDirPath [file join ${macports::registry.path} receipts_converted]
    180180                file mkdir $convertedDirPath
    181                 file rename $receipt_file $convertedDirPath
     181                file rename -- $receipt_file $convertedDirPath
    182182        } elseif {[string match "# Version: *" $receipt_contents]} {
    183183                # This is new format
     
    327327
    328328        if { [file exists ${receipt_file}] } {
    329                 file delete -force "${receipt_file}"
     329                file delete -force -- "${receipt_file}"
    330330        } elseif { [file exists ${receipt_file}.bz2] } {
    331                 file delete -force "${receipt_file}.bz2"
    332         }
    333 
    334         file rename -force "${receipt_file}.tmp" "${receipt_file}"
     331                file delete -force -- "${receipt_file}.bz2"
     332        }
     333
     334        file rename -force -- "${receipt_file}.tmp" "${receipt_file}"
    335335
    336336        if { [file exists ${receipt_file}] && [file exists ${registry::autoconf::bzip2_path}] && ![info exists registry.nobzip] } {
     
    421421                # remove port receipt directory
    422422                ui_debug "deleting directory: ${receipt_path}"
    423                 file delete -force ${receipt_path}
     423                file delete -force -- ${receipt_path}
    424424                # remove port receipt parent directory (if empty)
    425425                set receipt_dir [file join ${macports::registry.path} receipts ${name}]
     
    428428                        if { [llength [readdir ${receipt_dir}]] == 0 } {
    429429                                ui_debug "deleting directory: ${receipt_dir}"
    430                                 file delete -force ${receipt_dir}
     430                                file delete -force -- ${receipt_dir}
    431431                        } else {
    432432                                ui_debug "${receipt_dir} is not empty"
     
    846846
    847847    # don't both checking for presence, file delete doesn't error if file doesn't exist
    848     file delete ${map_file} ${map_file}.bz2
    849 
    850     file rename ${map_file}.tmp ${map_file}
     848    file delete -- ${map_file} ${map_file}.bz2
     849
     850    file rename -- ${map_file}.tmp ${map_file}
    851851
    852852        if { [file exists ${map_file}] && [file exists ${registry::autoconf::bzip2_path}] && ![info exists registry.nobzip] } {
Note: See TracChangeset for help on using the changeset viewer.