From 7eba6a0a3ec9ded052a9f82c55dc58dc29feaf6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr@debian.org>
Date: Sat, 8 Oct 2011 14:20:48 +0200
Subject: [PATCH] Generate correct dependencies if private directory supports
one Python version only (closes: #644573)
---
debian/changelog | 7 +++++++
debpython/depends.py | 11 +++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 916d806..66f2317 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-defaults (2.7.2-9) UNRELEASED; urgency=low
+
+ * Generate correct dependencies if private directory supports one Python
+ version only (closes: #644573)
+
+ -- Piotr Ożarowski <piotr@debian.org> Sat, 08 Oct 2011 14:18:31 +0200
+
python-defaults (2.7.2-8) unstable; urgency=high
* Fix update-manager Breaks (Closes: #644491)
diff --git a/debpython/depends.py b/debpython/depends.py
index d025af0..dfcd461 100644
--- a/debpython/depends.py
+++ b/debpython/depends.py
@@ -143,10 +143,13 @@ class Dependencies(object):
# are scripts for different Python versions: compile with
# default Python version (or the one requested via X-P-V)
args += "-V %s" % vrange_str(vr)
- if vr[0]: # minimum version specified
- self.depend("python (>= %s)" % vrepr(vr[0]))
- if vr[1]: # maximum version specified
- self.depend("python (<< %s)" % vrepr(vr[1]))
+ if vr[0] == vr[1]:
+ self.depend("python%s" % vrepr(vr[0]))
+ else:
+ if vr[0]: # minimum version specified
+ self.depend("python (>= %s)" % vrepr(vr[0]))
+ if vr[1]: # maximum version specified
+ self.depend("python (<< %s)" % vrepr(vr[1]))
for pattern in options.regexpr or []:
args += " -X '%s'" % pattern.replace("'", r"'\''")
--
GitLab