From 4b234a49a9e7631b52ef4d5fe5588877e61aaecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr@debian.org>
Date: Wed, 1 Dec 2010 19:44:40 +0100
Subject: [PATCH] adjust stats['public_vers'] after creating links from
/usr/share/pyshared
---
debian/changelog | 4 ++--
dh_python2 | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 13f9fc1..0b24bfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-defaults (2.6.6-6) UNRELEASED; urgency=low
+python-defaults (2.6.6-6) experimental; urgency=low
* dh_python2:
- make the error message about missing extension more clear
@@ -17,7 +17,7 @@ python-defaults (2.6.6-6) UNRELEASED; urgency=low
- do not try to check if interpreter is present when version range is
empty
- -- Piotr Ożarowski <piotr@debian.org> Sun, 21 Nov 2010 23:49:32 +0100
+ -- Piotr Ożarowski <piotr@debian.org> Wed, 01 Dec 2010 19:43:50 +0100
python-defaults (2.6.6-5) experimental; urgency=low
diff --git a/dh_python2 b/dh_python2
index 6b7756f..1404f52 100755
--- a/dh_python2
+++ b/dh_python2
@@ -28,7 +28,7 @@ import re
import sys
from filecmp import dircmp, cmpfiles
from optparse import OptionParser, SUPPRESS_HELP
-from os.path import isdir, islink, exists, join
+from os.path import isdir, islink, exists, join, realpath
from shutil import rmtree, copy as fcopy
from stat import ST_MODE, S_IXUSR, S_IXGRP, S_IXOTH
sys.path.insert(1, '/usr/share/python/')
@@ -154,6 +154,8 @@ def share(package, stats, options):
if srcver in stats['public_vers']:
stats['public_vers'].add(version)
share_2x(sitedir(srcver, package), sitedir(version, package))
+ # remove duplicates
+ stats['requires.txt'] = set(realpath(i) for i in stats['requires.txt'])
def move_to_pyshared(dir1):
@@ -515,6 +517,7 @@ def main():
pyshared_dir = "debian/%s/usr/share/pyshared/" % package
if not stats['public_vers'] and exists(pyshared_dir):
create_public_links(pyshared_dir, options.vrange)
+ stats['public_vers'] = get_requested_versions(options.vrange)
dependencies = Dependencies(package,
dh.packages[package]['uses_breaks'])
--
GitLab