[CalendarServer-changes] [5842] CalendarServer/branches/users/wsanchez/deployment/support/patchapply

[source_changes at macosforge.org]

Revision: 5842
          http://trac.macosforge.org/projects/calendarserver/changeset/5842
Author:   cdaboo at apple.com
Date:     2010-07-03 10:54:52 -0700 (Sat, 03 Jul 2010)
Log Message:
-----------
Revert previous change on this one file.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment/support/patchapply

Modified: CalendarServer/branches/users/wsanchez/deployment/support/patchapply
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/support/patchapply	2010-07-02 21:36:43 UTC (rev 5841)
+++ CalendarServer/branches/users/wsanchez/deployment/support/patchapply	2010-07-03 17:54:52 UTC (rev 5842)
@@ -26,37 +26,24 @@
 #
 
 #projects = ("Twisted", "vobject", "dateutil", "xattr")
-#projects = (("Twisted-4", "Twisted"), ("vobject-2","vobject",),)
-projects = (("Twisted-4", "Twisted"),)
-
+projects = ("Twisted", "vobject",)
 cwd = os.getcwd()
 libpatches = os.path.join(cwd, "lib-patches")
 
 cmd = "/usr/bin/patch"
 
 def applypatch(project, patch):
-
-    if isinstance(project, tuple):
-        project_path, project_name = project
-    else:
-        project_path = project_name = project
-
-    stat = os.system("%s -s -d ../%s/ -p0 --forward --dry-run -i %s > /dev/null" % (cmd, project_path, patch, ))
+    stat = os.system("%s -s -d ../%s/ -p0 --forward --dry-run -i %s > /dev/null" % (cmd, project, patch, ))
     if stat == 0:
-        print "+++ Patching %s with %s" % (project_path, patch[len(cwd) + 1:],)
-        os.system("%s -s -d ../%s/ -p0 --forward -i %s" % (cmd, project_path, patch, ))
+        print "+++ Patching %s with %s" % (project, patch[len(cwd) + 1:],)
+        os.system("%s -s -d ../%s/ -p0 --forward -i %s" % (cmd, project, patch, ))
     else:
-        print "*** Failed to patch %s with %s" % (project_path, patch[len(cwd) + 1:],)
+        print "*** Failed to patch %s with %s" % (project, patch[len(cwd) + 1:],)
 
 def applypatches(project):
     
-    if isinstance(project, tuple):
-        project_path, project_name = project
-    else:
-        project_path = project_name = project
-
     # Iterate over each patch file in the patches directory
-    path = os.path.join(libpatches, project_name)
+    path = os.path.join(libpatches, project)
     for file in os.listdir(path):
         fpath = os.path.join(path, file)
         if os.path.isfile(fpath) and fpath.endswith(".patch"):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100703/b163114a/attachment.html>