[CalendarServer-changes] [54] CalendarServer/branches/users/cdaboo/acl-merge/run

source_changes at macosforge.org source_changes at macosforge.org
Wed Aug 23 12:12:58 PDT 2006


Revision: 54
Author:   wsanchez at apple.com
Date:     2006-08-23 12:12:57 -0700 (Wed, 23 Aug 2006)

Log Message:
-----------
Fix svn_uri_base calculation.
Switch to Twisted branch acl-1608-8.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/acl-merge/run

Modified: CalendarServer/branches/users/cdaboo/acl-merge/run
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/run	2006-08-23 15:26:15 UTC (rev 53)
+++ CalendarServer/branches/users/cdaboo/acl-merge/run	2006-08-23 19:12:57 UTC (rev 54)
@@ -331,7 +331,7 @@
 # PyKerberos
 #
 
-svn_uri_base="$(svn info "${caldav}" | sed -n -e 's|/CalendarServer/trunk$||' -e 's|^URL: ||p')";
+svn_uri_base="$(svn info "${caldav}" | sed -n 's|Repository Root: ||p')";
 
 if [ -z "${svn_uri_base}" ]; then
     echo "Unable to locate subversion base URI for sources.";
@@ -406,12 +406,12 @@
 
 if ! "${disable_setup}"; then
   if [ "${USER}" == "wsanchez" ]; then
-    svn_uri="svn+ssh://svn.twistedmatrix.com/svn/Twisted/branches/wsanchez/acl-1608-2";
+    svn_uri="svn+ssh://svn.twistedmatrix.com/svn/Twisted/branches/wsanchez/acl-1608-8";
   else
-    svn_uri="svn://svn.twistedmatrix.com/svn/Twisted/branches/wsanchez/acl-1608-2";
+    svn_uri="svn://svn.twistedmatrix.com/svn/Twisted/branches/wsanchez/acl-1608-8";
   fi;
 
-  svn_get "Twisted" "${twisted}" "${svn_uri}" 17097;
+  svn_get "Twisted" "${twisted}" "${svn_uri}" 17928;
 fi;
 py_install "Twisted" "${twisted}";
  

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060823/96056a05/attachment.html


More information about the calendarserver-changes mailing list