[47619] branches/release_1_7

[blb at macports.org]

Revision: 47619
          http://trac.macports.org/changeset/47619
Author:   blb at macports.org
Date:     2009-03-01 23:07:12 -0800 (Sun, 01 Mar 2009)
Log Message:
-----------
Merge r46983 from trunk: upgrade_sources_conf_default.tcl - wrap calling svn
in a catch so we can be more graceful, ticket #17635

Modified Paths:
--------------
    branches/release_1_7/base/src/upgrade_sources_conf_default.tcl

Property Changed:
----------------
    branches/release_1_7/
    branches/release_1_7/base/


Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,47034
/trunk/base:45161
   + /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46983,47034
/trunk/base:45161


Property changes on: branches/release_1_7/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,47034
/trunk/base/base:45161
   + /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,46983,47034
/trunk/base/base:45161

Modified: branches/release_1_7/base/src/upgrade_sources_conf_default.tcl
===================================================================
--- branches/release_1_7/base/src/upgrade_sources_conf_default.tcl	2009-03-02 04:43:01 UTC (rev 47618)
+++ branches/release_1_7/base/src/upgrade_sources_conf_default.tcl	2009-03-02 07:07:12 UTC (rev 47619)
@@ -41,8 +41,7 @@
          } elseif {[regexp {rsync://rsync\.(macports|darwinports)\.org/(release|dpupdate)/d?ports} $url]} {
             set addDefault true
          } elseif {[regexp {file://(/.+)} $url -> filepath]} {
-            if {[file exists [file join ${filepath} .svn]]} {
-               set svnChannel [open "|svn info ${filepath}" r]
+            if {[file exists [file join ${filepath} .svn]] && ![catch {set svnChannel [open "|svn info ${filepath}" r]}]} {
                set svnURL {}
                while {[gets $svnChannel svnLine] >= 0} {
                   regexp {^URL: (.*)} $svnLine -> svnURL
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090301/278901de/attachment-0001.html>