[CalendarServer-changes] [149] CalendarServer/trunk/lib-patches/Twisted/twisted.svnversion.patch

source_changes at macosforge.org source_changes at macosforge.org
Mon Sep 18 18:13:24 PDT 2006


Revision: 149
Author:   wsanchez at apple.com
Date:     2006-09-18 18:13:23 -0700 (Mon, 18 Sep 2006)

Log Message:
-----------
Work around http://twistedmatrix.com/trac/ticket/1968 which causes
Twisted not to launch from a Subversion working copy if you upgrade to
Subversion 1.4.

Added Paths:
-----------
    CalendarServer/trunk/lib-patches/Twisted/twisted.svnversion.patch

Added: CalendarServer/trunk/lib-patches/Twisted/twisted.svnversion.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.svnversion.patch	                        (rev 0)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.svnversion.patch	2006-09-19 01:13:23 UTC (rev 149)
@@ -0,0 +1,24 @@
+Index: twisted/python/versions.py
+===================================================================
+--- twisted/python/versions.py  (revision 18204)
++++ twisted/python/versions.py  (working copy)
+@@ -90,17 +90,8 @@
+         """
+         mod = sys.modules.get(self.package)
+         if mod:
+-            ent = os.path.join(os.path.dirname(mod.__file__),
+-                               '.svn',
+-                               'entries')
+-            if os.path.exists(ent):
+-                from xml.dom.minidom import parse
+-                doc = parse(file(ent)).documentElement
+-                for node in doc.childNodes:
+-                    if hasattr(node, 'getAttribute'):
+-                        rev = node.getAttribute('revision')
+-                        if rev is not None:
+-                            return rev.encode('ascii')
++            rev = os.popen("svnversion %r" % (os.path.dirname(mod.__file__),)).read()
++            return rev
+ 
+     def _formatSVNVersion(self):
+         ver = self._getSVNVersion()

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


More information about the calendarserver-changes mailing list