[60582] branches/images-and-archives/base
blb at macports.org
blb at macports.org
Mon Nov 16 00:21:59 PST 2009
Revision: 60582
http://trac.macports.org/changeset/60582
Author: blb at macports.org
Date: 2009-11-16 00:21:56 -0800 (Mon, 16 Nov 2009)
Log Message:
-----------
Merge from trunk
Modified Paths:
--------------
branches/images-and-archives/base/ChangeLog
branches/images-and-archives/base/doc/prefix.mtree.in
branches/images-and-archives/base/src/macports1.0/macports.tcl
branches/images-and-archives/base/src/port/port.tcl
branches/images-and-archives/base/src/port1.0/portfetch.tcl
Property Changed:
----------------
branches/images-and-archives/base/
Property changes on: branches/images-and-archives/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:50249-60372
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:50249-60581
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/images-and-archives/base/ChangeLog
===================================================================
--- branches/images-and-archives/base/ChangeLog 2009-11-16 03:09:31 UTC (rev 60581)
+++ branches/images-and-archives/base/ChangeLog 2009-11-16 08:21:56 UTC (rev 60582)
@@ -5,6 +5,10 @@
Release 1.9.0 (unreleased):
+ - svn checkouts now use peg revisions instead of operative revisions,
+ so they'll continue to work if a repository gets reorganized
+ (#20777, ryandesign)
+
- Use CommonCrypto/CommonDigest instead of OpenSSL libcrypto. (toby)
- Add SHA256 checksums in addition to MD5, SHA1 and RIPEMD160. (afb)
@@ -25,6 +29,9 @@
This is a step in the direction of enabling binary distribution.
(snc in r58977)
+ - Add new log command and keeping of debug output for easy access
+ after port has run (GSoC 2009 logging project by enl, merged in r60372)
+
Release 1.8.1 (2009-09-28 by jmr):
- Installer error messages now display properly even from the Snow Leopard
Modified: branches/images-and-archives/base/doc/prefix.mtree.in
===================================================================
--- branches/images-and-archives/base/doc/prefix.mtree.in 2009-11-16 03:09:31 UTC (rev 60581)
+++ branches/images-and-archives/base/doc/prefix.mtree.in 2009-11-16 08:21:56 UTC (rev 60582)
@@ -245,6 +245,8 @@
..
distfiles
..
+ logs
+ ..
receipts
..
registry
Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl
===================================================================
--- branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-11-16 03:09:31 UTC (rev 60581)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-11-16 08:21:56 UTC (rev 60582)
@@ -112,10 +112,15 @@
proc macports::init_logging {portname} {
global ::debuglog ::debuglogname macports::channels macports::portdbpath
- set logname [file join $macports::portdbpath "logs/$portname"]
+ set logspath [file join $macports::portdbpath logs]
+ if {([file exists $logspath] && ![file writable $logspath]) || (![file exists $logspath] && ![file writable $macports::portdbpath])} {
+ ui_debug "logging disabled, can't write to $logspath"
+ return
+ }
+ set logname [file join $logspath $portname]
file mkdir $logname
set logname [file join $logname "main.log"]
- ui_msg $logname
+ ui_debug "logging to $logname"
set ::debuglogname $logname
# Recreate the file if already exists
@@ -151,7 +156,7 @@
set macports::current_stage $phase
if {$phase != "main"} {
set cur_time [clock format [clock seconds] -format {%+}]
- ui_any "---> Stage $phase started at $cur_time"
+ ui_debug "$phase phase started at $cur_time"
}
}
proc ui_message {priority prefix stage args} {
@@ -1431,7 +1436,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
@@ -1450,11 +1457,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
}
}
Modified: branches/images-and-archives/base/src/port/port.tcl
===================================================================
--- branches/images-and-archives/base/src/port/port.tcl 2009-11-16 03:09:31 UTC (rev 60581)
+++ branches/images-and-archives/base/src/port/port.tcl 2009-11-16 08:21:56 UTC (rev 60582)
@@ -1897,7 +1897,7 @@
foreach filename $portlist {
set file [file normalize $filename]
if {[file exists $file]} {
- if {![file isdirectory $file]} {
+ if {![file isdirectory $file] || [file type $file] == "link"} {
set port [registry::file_registered $file]
if { $port != 0 } {
puts "$file is provided by: $port"
Modified: branches/images-and-archives/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portfetch.tcl 2009-11-16 03:09:31 UTC (rev 60581)
+++ branches/images-and-archives/base/src/port1.0/portfetch.tcl 2009-11-16 08:21:56 UTC (rev 60582)
@@ -533,11 +533,15 @@
# Perform an svn fetch
proc portfetch::svnfetch {args} {
- global svn.args svn.revision svn.method
+ global svn.args svn.method svn.revision svn.url
+ if {[regexp {\s} ${svn.url}]} {
+ return -code error [msgcat::mc "Subversion URL cannot contain whitespace"]
+ }
+
set svn.args "${svn.method} ${svn.args}"
if {[string length ${svn.revision}]} {
- set svn.args "${svn.args} -r ${svn.revision}"
+ append svn.url "@${svn.revision}"
}
if {[catch {command_exec svn "" "2>&1"} result]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091116/88d57c70/attachment.html>
More information about the macports-changes
mailing list