[60573] trunk/base

[ryandesign at macports.org]

Revision: 60573
          http://trac.macports.org/changeset/60573
Author:   ryandesign at macports.org
Date:     2009-11-15 16:32:27 -0800 (Sun, 15 Nov 2009)
Log Message:
-----------
Use peg revision instead of operative revision for svn checkouts; fixes #20777.

Modified Paths:
--------------
    trunk/base/ChangeLog
    trunk/base/src/port1.0/portfetch.tcl

Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog	2009-11-16 00:25:57 UTC (rev 60572)
+++ trunk/base/ChangeLog	2009-11-16 00:32:27 UTC (rev 60573)
@@ -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)

Modified: trunk/base/src/port1.0/portfetch.tcl
===================================================================
--- trunk/base/src/port1.0/portfetch.tcl	2009-11-16 00:25:57 UTC (rev 60572)
+++ trunk/base/src/port1.0/portfetch.tcl	2009-11-16 00:32:27 UTC (rev 60573)
@@ -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/20091115/ab383fbb/attachment.html>