[cig-commits] r14737 - in cs/merlin/branches/v1: . merlin/command merlin.egg-info

[leif at geodynamics.org]

Author: leif
Date: 2009-04-16 12:38:02 -0700 (Thu, 16 Apr 2009)
New Revision: 14737

Modified:
   cs/merlin/branches/v1/PKG-INFO
   cs/merlin/branches/v1/merlin.egg-info/PKG-INFO
   cs/merlin/branches/v1/merlin/command/egg_info.py
   cs/merlin/branches/v1/merlin/command/sdist.py
   cs/merlin/branches/v1/setup.py
Log:
Issue526: Merged fixes from setuptools v0.6c9 which add support for
the new .svn/entries format introduced in Subversion v1.5.


Modified: cs/merlin/branches/v1/PKG-INFO
===================================================================
--- cs/merlin/branches/v1/PKG-INFO	2009-04-16 18:57:43 UTC (rev 14736)
+++ cs/merlin/branches/v1/PKG-INFO	2009-04-16 19:38:02 UTC (rev 14737)
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: merlin
-Version: 1.6
+Version: 1.7
 Summary: A custom version of Phillip J. Eby's setuptools.
 Home-page: http://www.geodynamics.org/cig/software/packages/cs/pythia/
 Author: Leif Strand

Modified: cs/merlin/branches/v1/merlin/command/egg_info.py
===================================================================
--- cs/merlin/branches/v1/merlin/command/egg_info.py	2009-04-16 18:57:43 UTC (rev 14736)
+++ cs/merlin/branches/v1/merlin/command/egg_info.py	2009-04-16 19:38:02 UTC (rev 14737)
@@ -217,14 +217,14 @@
             data = f.read()
             f.close()
 
-            if data.startswith('8'):
+            if data.startswith('9') or data.startswith('8'):
                 data = map(str.splitlines,data.split('\n\x0c\n'))
-                del data[0][0]  # get rid of the '8'
+                del data[0][0]  # get rid of the '8' or '9'
                 dirurl = data[0][3]
-                localrev = max([int(d[9]) for d in data if len(d)>9])
+                localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0])
             elif data.startswith('<?xml'):
                 dirurl = urlre.search(data).group(1)    # get repository URL
-                localrev = max([int(m.group(1)) for m in revre.finditer(data)])
+                localrev = max([int(m.group(1)) for m in revre.finditer(data)]+[0])
             else:
                 from warnings import warn
                 warn("unrecognized .svn/entries format; skipping "+base)

Modified: cs/merlin/branches/v1/merlin/command/sdist.py
===================================================================
--- cs/merlin/branches/v1/merlin/command/sdist.py	2009-04-16 18:57:43 UTC (rev 14736)
+++ cs/merlin/branches/v1/merlin/command/sdist.py	2009-04-16 19:38:02 UTC (rev 14737)
@@ -86,7 +86,7 @@
     f = open(filename,'rU')
     data = f.read()
     f.close()
-    if data.startswith('8'):    # subversion 1.4
+    if data.startswith('9') or data.startswith('8'):    # subversion 1.5/1.4
         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
             if not record or len(record)>=6 and record[5]=="delete":
                 continue    # skip deleted

Modified: cs/merlin/branches/v1/merlin.egg-info/PKG-INFO
===================================================================
--- cs/merlin/branches/v1/merlin.egg-info/PKG-INFO	2009-04-16 18:57:43 UTC (rev 14736)
+++ cs/merlin/branches/v1/merlin.egg-info/PKG-INFO	2009-04-16 19:38:02 UTC (rev 14737)
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: merlin
-Version: 1.6
+Version: 1.7
 Summary: A custom version of Phillip J. Eby's setuptools.
 Home-page: http://www.geodynamics.org/cig/software/packages/cs/pythia/
 Author: Leif Strand

Modified: cs/merlin/branches/v1/setup.py
===================================================================
--- cs/merlin/branches/v1/setup.py	2009-04-16 18:57:43 UTC (rev 14736)
+++ cs/merlin/branches/v1/setup.py	2009-04-16 19:38:02 UTC (rev 14737)
@@ -20,7 +20,7 @@
 SETUP_COMMANDS = d['__all__']
 
 
-VERSION = "1.6"
+VERSION = "1.7"
 from merlin import setup, find_packages
 import sys
 scripts = []