[38642] branches/gsoc08-privileges/base/src/port1.0

[pmagrath at macports.org]

Revision: 38642
          http://trac.macosforge.org/projects/macports/changeset/38642
Author:   pmagrath at macports.org
Date:     2008-07-26 09:37:06 -0700 (Sat, 26 Jul 2008)
Log Message:
-----------
Fix port clean of distfiles when altprefix is in use.

Modified Paths:
--------------
    branches/gsoc08-privileges/base/src/port1.0/portclean.tcl
    branches/gsoc08-privileges/base/src/port1.0/portutil.tcl

Modified: branches/gsoc08-privileges/base/src/port1.0/portclean.tcl
===================================================================
--- branches/gsoc08-privileges/base/src/port1.0/portclean.tcl	2008-07-26 16:19:18 UTC (rev 38641)
+++ branches/gsoc08-privileges/base/src/port1.0/portclean.tcl	2008-07-26 16:37:06 UTC (rev 38642)
@@ -143,7 +143,7 @@
 	if {$count > 0} {
 		ui_debug "$count distfile(s) removed."
 	} else {
-		ui_debug "No distfiles found to remove."
+		ui_debug "No distfiles found to remove at $distpath"
 	}
 
 	# next remove dist_subdir if only needed for this port,
@@ -254,7 +254,7 @@
 	if {$count > 0} {
 		ui_debug "$count archive(s) removed."
 	} else {
-		ui_debug "No archives found to remove."
+		ui_debug "No archives found to remove at $archivepath"
 	}
 
 	return 0

Modified: branches/gsoc08-privileges/base/src/port1.0/portutil.tcl
===================================================================
--- branches/gsoc08-privileges/base/src/port1.0/portutil.tcl	2008-07-26 16:19:18 UTC (rev 38641)
+++ branches/gsoc08-privileges/base/src/port1.0/portutil.tcl	2008-07-26 16:37:06 UTC (rev 38642)
@@ -1396,7 +1396,7 @@
 # open file to store name of completed targets
 proc open_statefile {args} {
     global workpath worksymlink place_worksymlink portname portpath ports_ignore_older
-    global altprefix macportsuser euid egid usealtworkpath env applications_dir portbuildpath
+    global altprefix macportsuser euid egid usealtworkpath env applications_dir portbuildpath distpath
     
 	# start gsoc08-privileges
 
@@ -1459,6 +1459,7 @@
 		set newworkpath "$altprefix/[ string range $workpath 1 end ]"
 		set newworksymlink "$altprefix/[ string range $worksymlink 1 end ]"
 		set newportbuildpath "$altprefix/[ string range $portbuildpath 1 end ]"
+		set newdistpath "$altprefix/[ string range $distpath 1 end ]"
 		
 		set sourcepath [string map {"work" ""} $worksymlink] 
 		set newsourcepath "$altprefix/[ string range $sourcepath 1 end ]"
@@ -1479,6 +1480,7 @@
 		set workpath $newworkpath
 		set worksymlink $newworksymlink
 		set portbuildpath $newportbuildpath
+		set distpath $newdistpath
 		
 		ui_debug "Going to use $newworkpath for statefile."
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080726/588f4cc4/attachment.html