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

[source_changes at macosforge.org]

Revision: 88
Author:   cdaboo at apple.com
Date:     2006-08-31 06:51:07 -0700 (Thu, 31 Aug 2006)

Log Message:
-----------
Merge of r87.

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-31 13:45:20 UTC (rev 87)
+++ CalendarServer/branches/users/cdaboo/acl-merge/run	2006-08-31 13:51:07 UTC (rev 88)
@@ -331,7 +331,7 @@
 # PyKerberos
 #
 
-svn_uri_base="$(svn info "${caldav}" | sed -n 's|Repository Root: ||p')";
+svn_uri_base="$(svn info "${caldav}" | sed -n -e 's|/CalendarServer/trunk$||' -e 's|^URL: ||p')";
 
 if [ -z "${svn_uri_base}" ]; then
     echo "Unable to locate subversion base URI for sources.";
@@ -342,7 +342,7 @@
   kerberos="${top}/PyKerberos";
 
   if ! "${disable_setup}"; then
-    svn_get "PyKerberos" "${kerberos}" "${svn_uri_base}/PyKerberos/trunk" 33;
+    svn_get "PyKerberos" "${kerberos}" "${svn_uri_base}/PyKerberos/trunk" 74;
 
     if "${force_setup}" || [ ! -d "${kerberos}/build/${py_platform_libdir}" ]; then
       echo "";
@@ -406,12 +406,12 @@
 
 if ! "${disable_setup}"; then
   if [ "${USER}" == "wsanchez" ]; then
-    svn_uri="svn+ssh://svn.twistedmatrix.com/svn/Twisted/branches/acl-1608-8";
+    svn_uri="svn+ssh://svn.twistedmatrix.com/svn/Twisted/branches/wsanchez/acl-1608-2";
   else
-    svn_uri="svn://svn.twistedmatrix.com/svn/Twisted/branches/acl-1608-8";
+    svn_uri="svn://svn.twistedmatrix.com/svn/Twisted/branches/wsanchez/acl-1608-2";
   fi;
 
-  svn_get "Twisted" "${twisted}" "${svn_uri}" 17928;
+  svn_get "Twisted" "${twisted}" "${svn_uri}" 17097;
 fi;
 py_install "Twisted" "${twisted}";
  

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