[79442] trunk/base/src/upgrade_sources_conf_default.tcl

[jmr at macports.org]

Revision: 79442
          http://trac.macports.org/changeset/79442
Author:   jmr at macports.org
Date:     2011-06-13 06:55:44 -0700 (Mon, 13 Jun 2011)
Log Message:
-----------
keep going in upgrade_sources_conf_default.tcl even if svn appears to fail (#27799)

Modified Paths:
--------------
    trunk/base/src/upgrade_sources_conf_default.tcl

Modified: trunk/base/src/upgrade_sources_conf_default.tcl
===================================================================
--- trunk/base/src/upgrade_sources_conf_default.tcl	2011-06-13 13:19:58 UTC (rev 79441)
+++ trunk/base/src/upgrade_sources_conf_default.tcl	2011-06-13 13:55:44 UTC (rev 79442)
@@ -68,18 +68,15 @@
                      regexp {^URL: (.*)} $svnLine -> svnURL
                   }
                   if {[catch {close $svnChannel} err]} {
-                     if {![string match "*This client is too old to work with working copy*" $err]} {
-                        return -code error $err
-                     } else {
-                        puts $err
-                        puts "WARNING: Unable to check svn URL for '$filepath' as it has been checked out with a newer Subversion client; please manually verify $sourcesConf!"
-                     }
+                     puts $err
+                     puts "WARNING: Unable to check svn URL for '$filepath'; please manually verify $sourcesConf!"
                   }
                   if {[regexp {^https?://svn\.(macports|macosforge)\.org/repository/macports/trunk/dports} $svnURL]} {
                      set addDefault true
                   }
                } else {
-                  return -code error $err
+                  puts $err
+                  puts "WARNING: Unable to check svn URL for '$filepath'; please manually verify $sourcesConf!"
                }
             }
          }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110613/7825272d/attachment.html>