[69044] trunk/base/src/port1.0/portclean.tcl
jmr at macports.org
jmr at macports.org
Mon Jun 21 15:58:09 PDT 2010
Revision: 69044
http://trac.macports.org/changeset/69044
Author: jmr at macports.org
Date: 2010-06-21 15:58:09 -0700 (Mon, 21 Jun 2010)
Log Message:
-----------
use archive subdir in clean too
Modified Paths:
--------------
trunk/base/src/port1.0/portclean.tcl
Modified: trunk/base/src/port1.0/portclean.tcl
===================================================================
--- trunk/base/src/port1.0/portclean.tcl 2010-06-21 22:52:44 UTC (rev 69043)
+++ trunk/base/src/port1.0/portclean.tcl 2010-06-21 22:58:09 UTC (rev 69044)
@@ -222,7 +222,7 @@
# Define archive destination directory, target filename, regex for archive name
if {$portarchivepath ne $workpath && $portarchivepath ne ""} {
- set archivepath [file join $portarchivepath [option os.platform]]
+ set archivepath [file join $portarchivepath [option os.platform]_[option os.major]]
set regexstring "^$name-\[\\-_a-zA-Z0-9\\.\]+_\[0-9\]*\[+\\-_a-zA-Z0-9\]*\[\\.\].*\[\\.\]\[a-z2\]+\$"
}
@@ -243,7 +243,7 @@
# Remove the archive files
set count 0
- if {![catch {set archivelist [glob [file join $archivepath * $fileglob]]} result]} {
+ if {![catch {set archivelist [glob [file join $archivepath * $name $fileglob]]} result]} {
foreach path $archivelist {
set file [file tail $path]
# Make sure file is truly a port archive file, and not
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100621/05ee3a48/attachment.html>
More information about the macports-changes
mailing list