Skip to content
Snippets Groups Projects
Commit 43994f3a authored by Steve Langasek's avatar Steve Langasek
Browse files

* Non-maintainer upload.

* Adjust debpython/depends.py to be multiarch-friendly.
parent 560e36ef
No related branches found
No related tags found
No related merge requests found
python-defaults (2.7.5-4.1) UNRELEASED; urgency=low
* Non-maintainer upload.
* Adjust debpython/depends.py to be multiarch-friendly.
-- Steve Langasek <vorlon@debian.org> Fri, 06 Sep 2013 17:18:18 -0700
python-defaults (2.7.5-4) unstable; urgency=low python-defaults (2.7.5-4) unstable; urgency=low
* Add libpython-all-dbg.postinst to convert the doc directory to a symlink * Add libpython-all-dbg.postinst to convert the doc directory to a symlink
......
...@@ -24,7 +24,7 @@ from debpython.pydist import parse_pydep, guess_dependency ...@@ -24,7 +24,7 @@ from debpython.pydist import parse_pydep, guess_dependency
from debpython.version import DEFAULT, SUPPORTED, debsorted, vrepr, vrange_str from debpython.version import DEFAULT, SUPPORTED, debsorted, vrepr, vrange_str
# minimum version required for pycompile/pyclean # minimum version required for pycompile/pyclean
MINPYCDEP = 'python (>= 2.6.6-7~)' MINPYCDEP = 'python:any (>= 2.6.6-7~)'
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
...@@ -115,20 +115,20 @@ class Dependencies(object): ...@@ -115,20 +115,20 @@ class Dependencies(object):
self.depend(MINPYCDEP) self.depend(MINPYCDEP)
for interpreter, version in stats['shebangs']: for interpreter, version in stats['shebangs']:
self.depend(interpreter) self.depend("%s:any" % interpreter)
for private_dir, details in stats['private_dirs'].iteritems(): for private_dir, details in stats['private_dirs'].iteritems():
versions = list(v for i, v in details.get('shebangs', []) if v) versions = list(v for i, v in details.get('shebangs', []) if v)
for v in versions: for v in versions:
if v in SUPPORTED: if v in SUPPORTED:
self.depend("python%d.%d" % v) self.depend("python%d.%d:any" % v)
else: else:
log.info('dependency on python%s (from shebang) ignored' log.info('dependency on python%s (from shebang) ignored'
' - it\'s not supported anymore', vrepr(v)) ' - it\'s not supported anymore', vrepr(v))
# /usr/bin/python shebang → add python to Depends # /usr/bin/python shebang → add python to Depends
if any(True for i, v in details.get('shebangs', []) if v is None): if any(True for i, v in details.get('shebangs', []) if v is None):
self.depend('python') self.depend('python:any')
if details.get('compile', False): if details.get('compile', False):
self.depend(MINPYCDEP) self.depend(MINPYCDEP)
...@@ -144,12 +144,12 @@ class Dependencies(object): ...@@ -144,12 +144,12 @@ class Dependencies(object):
if vr == (None, None): if vr == (None, None):
pass pass
elif vr[0] == vr[1]: elif vr[0] == vr[1]:
self.depend("python%s" % vrepr(vr[0])) self.depend("python%s:any" % vrepr(vr[0]))
else: else:
if vr[0]: # minimum version specified if vr[0]: # minimum version specified
self.depend("python (>= %s)" % vrepr(vr[0])) self.depend("python:any (>= %s)" % vrepr(vr[0]))
if vr[1]: # maximum version specified if vr[1]: # maximum version specified
self.depend("python (<< %d.%d)" % \ self.depend("python:any (<< %d.%d)" % \
(vr[1][0], vr[1][1] + 1)) (vr[1][0], vr[1][1] + 1))
for pattern in options.regexpr or []: for pattern in options.regexpr or []:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment