[CalendarServer-changes] [208] CalendarServer/trunk/run

[source_changes at macosforge.org]

Revision: 208
          http://trac.macosforge.org/projects/collaboration/changeset/208
Author:   wsanchez at apple.com
Date:     2006-09-26 15:31:54 -0700 (Tue, 26 Sep 2006)

Log Message:
-----------
Use --xml option with svn info to avoid locale issues

Modified Paths:
--------------
    CalendarServer/trunk/run

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2006-09-26 21:39:04 UTC (rev 207)
+++ CalendarServer/trunk/run	2006-09-26 22:31:54 UTC (rev 208)
@@ -192,7 +192,7 @@
   local revision="$1"; shift;
 
   if [ -d "${path}" ]; then
-    wc_uri="$(svn info "${path}" 2> /dev/null | sed -n 's|^URL: ||p')";
+    wc_uri="$(svn info --xml "${path}" 2> /dev/null | sed -n 's|^.*<url>\(.*\)</url>.*$|\1|p')";
 
     if "${force_setup}"; then
       # Verify that we have a working copy checked out from the correct URI
@@ -332,7 +332,7 @@
 # PyKerberos
 #
 
-svn_uri_base="$(svn info "${caldav}" | sed -n 's|Repository Root: ||p')";
+svn_uri_base="$(svn info "${caldav}" --xml | sed -n 's|^.*<root>\(.*\)</root>.*$|\1|p')";
 
 if [ -z "${svn_uri_base}" ]; then
     echo "Unable to locate subversion base URI for sources.";

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060926/7ed61353/attachment.html