[Reproducible-builds] [dh-python] 126/183: dh_py: do not generate :any dependencies for PyPy

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dh-python.

commit 37775fa5ec6b8596050ea045cc41ae525bd77a79
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Fri Sep 13 20:55:18 2013 +0200

    dh_py: do not generate :any dependencies for PyPy
---
 debian/changelog    |  4 ++--
 dhpython/depends.py | 21 ++++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d528264..8b128e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dh-python (1.20130913-1) UNRELEASED; urgency=low
+dh-python (1.20130913-1) unstable; urgency=low
 
   [ Piotr Ożarowski ]
   * dh_py*:
@@ -13,7 +13,7 @@ dh-python (1.20130913-1) UNRELEASED; urgency=low
   * pybuild: fix --test when LC_ALL=C and setup.py contains non-ascii
     characters (closes: 722214)
 
- -- Piotr Ożarowski <piotr at debian.org>  Fri, 06 Sep 2013 20:27:05 +0200
+ -- Piotr Ożarowski <piotr at debian.org>  Fri, 13 Sep 2013 20:47:46 +0200
 
 dh-python (1.20130903-1) unstable; urgency=low
 
diff --git a/dhpython/depends.py b/dhpython/depends.py
index 989d4fa..d6999cf 100644
--- a/dhpython/depends.py
+++ b/dhpython/depends.py
@@ -34,6 +34,8 @@ class Dependencies:
         self.impl = impl
         self.package = package
         self.is_debug_package = dbgpkg = package.endswith('-dbg')
+
+        # TODO: move it to PyPy and CPython{2,3} classes
         self.ipkg_vtpl = 'python%s-dbg' if dbgpkg else 'python%s'
         if impl == 'cpython3':
             self.ipkg_tpl = 'python3-dbg' if dbgpkg else 'python3'
@@ -42,6 +44,13 @@ class Dependencies:
         elif impl == 'pypy':
             self.ipkg_tpl = 'pypy-dbg' if dbgpkg else 'pypy'
             self.ipkg_vtpl = 'pypy%s-dbg' if dbgpkg else 'pypy%s'
+        if impl == 'pypy':
+            self.ipkg_tpl_ma = self.ipkg_tpl
+            self.ipkg_vtpl_ma = self.ipkg_vtpl
+        else:
+            self.ipkg_tpl_ma = self.ipkg_tpl + ':any'
+            self.ipkg_vtpl_ma = self.ipkg_vtpl + ':any'
+
         self.depends = set()
         self.recommends = []
         self.suggests = []
@@ -98,6 +107,8 @@ class Dependencies:
         log.debug('generating dependencies for package %s', self.package)
         tpl = self.ipkg_tpl
         vtpl = self.ipkg_vtpl
+        tpl_ma = self.ipkg_tpl_ma
+        vtpl_ma = self.ipkg_vtpl_ma
         vrange = options.vrange
 
 	# Shebang depends are the only things that get python:any
@@ -109,9 +120,9 @@ class Dependencies:
                 self.depend(vtpl % minv)
                 minv = maxv = None
             if minv:
-                self.depend("%s:any (>= %s)" % (tpl, minv))
+                self.depend("%s (>= %s)" % (tpl_ma, minv))
             if maxv:
-                self.depend("%s:any (<< %s)" % (tpl, maxv))
+                self.depend("%s (<< %s)" % (tpl_ma, maxv))
 
         if vrange and any((stats['compile'], stats['public_vers'],
                           stats['ext_vers'], stats['ext_no_version'])):
@@ -152,7 +163,7 @@ class Dependencies:
             self.depend(MINPYCDEP[self.impl])
 
         for ipreter in stats['shebangs']:
-            self.depend("%s:any" % str(ipreter))
+            self.depend("%s%s" % (ipreter, ':any' if self.impl == 'pypy' else ''))
 
         supported_versions = supported(self.impl)
         default_version = default(self.impl)
@@ -161,13 +172,13 @@ class Dependencies:
 
             for v in versions:
                 if v in supported_versions:
-                    self.depend("%s:any" % (vtpl % v))
+                    self.depend(vtpl_ma % v)
                 else:
                     log.info('dependency on %s (from shebang) ignored'
                              ' - it\'s not supported anymore', vtpl % v)
             # /usr/bin/python{,3} shebang → add python{,3} to Depends
             if any(True for i in details.get('shebangs', []) if i.version is None):
-                self.depend("%s:any" % tpl)
+                self.depend(tpl_ma)
 
             extensions = sorted(details.get('ext_vers', set()))
             #self.depend('|'.join(vtpl % i for i in extensions))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dh-python.git