[60387] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 60387
          http://trac.macports.org/changeset/60387
Author:   jmr at macports.org
Date:     2009-11-10 12:24:47 -0800 (Tue, 10 Nov 2009)
Log Message:
-----------
handle lack of a logs dir or a ::debuglog fd gracefully

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2009-11-10 20:09:36 UTC (rev 60386)
+++ trunk/base/src/macports1.0/macports.tcl	2009-11-10 20:24:47 UTC (rev 60387)
@@ -112,7 +112,7 @@
     global ::debuglog ::debuglogname macports::channels macports::portdbpath
 
     set logspath [file join $macports::portdbpath logs]
-    if {![file writable $logspath]} {
+    if {([file exists $logspath] && ![file writable $logspath]) || (![file exists $logspath] && ![file writable $macports::portdbpath])} {
         ui_debug "logging disabled, can't write to $logspath"
         return
     }
@@ -1474,7 +1474,9 @@
 
 proc _mportexec {target mport} {
     global ::debuglog
-    set previouslog $::debuglog
+    if {[info exists ::debuglog]} {
+        set previouslog $::debuglog
+    }
     set portname [_mportkey $mport name]
     ui_debug "Starting logging for $portname"
     macports::ch_logging $portname
@@ -1493,11 +1495,15 @@
             catch {cd $portpath}
             $workername eval eval_targets clean
         }
-        set ::debuglog $previouslog
+        if {[info exists previouslog]} {
+            set ::debuglog $previouslog
+        }
         return 0
     } else {
         # An error occurred.
-        set ::debuglog $previouslog
+        if {[info exists previouslog]} {
+            set ::debuglog $previouslog
+        }
         return 1
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091110/a895e2af/attachment-0001.html>