[61303] branches/release_1_8

[jmr at macports.org]

Revision: 61303
          http://trac.macports.org/changeset/61303
Author:   jmr at macports.org
Date:     2009-12-08 03:52:27 -0800 (Tue, 08 Dec 2009)
Log Message:
-----------
merge r61302 from trunk:
 stop upgrade_sources_conf_default.tcl from erroring when there are svn sources but no svn command, and allow it to find svn in ${prefix}/bin (#20760)

Revision Links:
--------------
    http://trac.macports.org/changeset/61302

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

Property Changed:
----------------
    branches/release_1_8/
    branches/release_1_8/base/


Property changes on: branches/release_1_8
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,56147,56160,56162,56435,56448,57026,57255,57436,57441,57784,57801,57871,57974,58445,59318,59585,60259-60260,60798
   + /trunk:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,56147,56160,56162,56435,56448,57026,57255,57436,57441,57784,57801,57871,57974,58445,59318,59585,60259-60260,60798,61302


Property changes on: branches/release_1_8/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/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:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56160,56162,56435,56448,56472-56474,56666,56889,57026,57048,57055,57131,57255,57436,57441,57784,57801,57820,57871,57974,57979,57982,58093,58445,59318,59585,60259-60260,60798
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/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:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56160,56162,56435,56448,56472-56474,56666,56889,57026,57048,57055,57131,57255,57436,57441,57784,57801,57820,57871,57974,57979,57982,58093,58445,59318,59585,60259-60260,60798,61302
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_1_8/base/src/upgrade_sources_conf_default.tcl
===================================================================
--- branches/release_1_8/base/src/upgrade_sources_conf_default.tcl	2009-12-08 11:50:06 UTC (rev 61302)
+++ branches/release_1_8/base/src/upgrade_sources_conf_default.tcl	2009-12-08 11:52:27 UTC (rev 61303)
@@ -42,7 +42,20 @@
             set addDefault true
          } elseif {[regexp {file://(/.+)} $url -> filepath]} {
             if {[file exists [file join ${filepath} .svn]]} {
-               if {![catch {set svnChannel [open "|svn info ${filepath}" r]} err]} {
+               if {![info exists svnCmd]} {
+                  set svnCmd ""
+                  foreach path [concat [list ${prefix}/bin] [split $env(PATH) :]] {
+                     if {[file executable ${path}/svn]} {
+                        set svnCmd ${path}/svn
+                        break
+                     }
+                  }
+               }
+               if {$svnCmd == ""} {
+                  puts "WARNING: Unable to check svn URL for '$filepath' because no svn command could be found; please manually verify $sourcesConf!"
+                  continue
+               }
+               if {![catch {set svnChannel [open "|$svnCmd info ${filepath}" r]} err]} {
                   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/20091208/078edb71/attachment.html>