[63542] trunk/base/src

[raimue at macports.org]

Revision: 63542
          http://trac.macports.org/changeset/63542
Author:   raimue at macports.org
Date:     2010-02-07 19:54:43 -0800 (Sun, 07 Feb 2010)
Log Message:
-----------
port1.0, macports1.0:
After r63266, port clean did not remove log files; copy_log_files option did
copy to the wrong directory.

Revision Links:
--------------
    http://trac.macports.org/changeset/63266

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port1.0/portclean.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-02-08 01:55:24 UTC (rev 63541)
+++ trunk/base/src/macports1.0/macports.tcl	2010-02-08 03:54:43 UTC (rev 63542)
@@ -951,6 +951,7 @@
     $workername alias macports_create_thread macports::create_thread
     $workername alias getportworkpath_from_buildpath macports::getportworkpath_from_buildpath
     $workername alias getportresourcepath macports::getportresourcepath
+    $workername alias getportlogpath macports::getportlogpath
     $workername alias getdefaultportresourcepath macports::getdefaultportresourcepath
     $workername alias getprotocol macports::getprotocol
     $workername alias getportdir macports::getportdir

Modified: trunk/base/src/port1.0/portclean.tcl
===================================================================
--- trunk/base/src/port1.0/portclean.tcl	2010-02-08 01:55:24 UTC (rev 63541)
+++ trunk/base/src/port1.0/portclean.tcl	2010-02-08 03:54:43 UTC (rev 63542)
@@ -202,8 +202,8 @@
     return 0
 }
 proc portclean::clean_logs {args} {
-    global portbuildpath worksymlink name portverbose keeplogs prefix
- 	  set logpath "${prefix}/var/macports/logs/${name}"
+    global portpath portbuildpath worksymlink name portverbose keeplogs prefix
+    set logpath [file join [getportlogpath $portpath]]
   	if {[file isdirectory $logpath]} {
         ui_debug "Removing directory: ${logpath}"
         if {[catch {delete $logpath} result]} {

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2010-02-08 01:55:24 UTC (rev 63541)
+++ trunk/base/src/port1.0/portutil.tcl	2010-02-08 03:54:43 UTC (rev 63542)
@@ -1199,7 +1199,7 @@
 set ports_dry_last_skipped ""
 
 proc target_run {ditem} {
-    global target_state_fd workpath ports_trace PortInfo ports_dryrun ports_dry_last_skipped current_stage worksrcpath prefix
+    global target_state_fd workpath portpath ports_trace PortInfo ports_dryrun ports_dry_last_skipped current_stage worksrcpath prefix
     set portname [option name]
     set result 0
     set skipped 0
@@ -1362,7 +1362,7 @@
         }
         if {[exists copy_log_files]} {
             set log_files [option copy_log_files]
-            set log_dir "$prefix/var/macports/logs/$portname"
+            set log_dir [file join [getportlogpath $portpath]]
             file mkdir $log_dir
  
             foreach log_file $log_files {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100207/c987979c/attachment.html>