r2764 - in zope2.13/trunk/debian (2 files)

[arnau at users.alioth.debian.org]

    Date: Wednesday, June 11, 2014 @ 05:10:33
  Author: arnau
Revision: 2764

NUR: Handle relative extends file when parsing buildout recipe (versions) for
generating versions for source tarball, previously was an absolute URL.

Modified:
  zope2.13/trunk/debian/build-scripts/gen_versions_cfg.py
  zope2.13/trunk/debian/changelog

Modified: zope2.13/trunk/debian/build-scripts/gen_versions_cfg.py
===================================================================
--- zope2.13/trunk/debian/build-scripts/gen_versions_cfg.py	2014-06-11 05:05:30 UTC (rev 2763)
+++ zope2.13/trunk/debian/build-scripts/gen_versions_cfg.py	2014-06-11 05:10:33 UTC (rev 2764)
@@ -12,7 +12,7 @@
 import tempfile
 import urllib2
 import ConfigParser
-from urlparse import urlparse
+from urlparse import urlparse, urljoin
 
 assert sys.version_info >= (2, 7), "Python >= 2.7 is required"
 
@@ -24,7 +24,7 @@
     def __init__(self, file_path, comes_from=None):
         self.file_path = file_path
         if not comes_from is None or not isinstance(comes_from, self.__class__):
-            RuntimeError("Expected None or a %s type object, recieved %s." \
+            RuntimeError("Expected None or a %s type object, received %s." \
                          % (self.__class__.__name__, type(comes_from)))
         self.cfg = self.__class__.read_cfg(self.file_path)
         self.comes_from = comes_from
@@ -38,8 +38,9 @@
         url_parts = urlparse(extends_value)
         
         kls = self.__class__
-        if url_parts.scheme is None \
-           or url_parts.scheme == 'file':
+        if not url_parts.scheme:
+            self.extends = kls.from_url(urljoin(self.comes_from, extends_value), self)
+        elif url_parts.scheme == 'file':
             self.extends = kls(url_parts.path, self)
         else:
             self.extends = kls.from_url(extends_value, self)
@@ -56,8 +57,7 @@
         file_path = tempfile.mkstemp()[1]
         with open(file_path, 'w') as f:
             f.write(data.read())
-        obj = cls(file_path, comes_from=comes_from)
-        setattr(obj, 'url', url)
+        obj = cls(file_path, comes_from=url)
         return obj
 
     @staticmethod

Modified: zope2.13/trunk/debian/changelog
===================================================================
--- zope2.13/trunk/debian/changelog	2014-06-11 05:05:30 UTC (rev 2763)
+++ zope2.13/trunk/debian/changelog	2014-06-11 05:10:33 UTC (rev 2764)
@@ -2,6 +2,10 @@
 
   * New upstream release.
     + debian/patches/use-python-initgroups.patch: Refreshed.
+    + debian/build-scripts/gen_versions_cfg.py:
+      - Handle relative extends file when parsing buildout recipe (versions)
+        for generating versions for source tarball, previously was an
+        absolute URL.
 
  -- Arnaud Fontaine <arnau at debian.org>  Wed, 11 Jun 2014 11:01:43 +0900