From 94cbe609ab9f06ab836ee396e6f67d0319ab3d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr@debian.org> Date: Thu, 6 Sep 2012 00:01:20 +0200 Subject: [PATCH] ignore /usr/bin/python3 shebangs in all packages, not just in python3-* ones --- debian/changelog | 9 +++++++-- debpython/tools.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0188628..15fcc7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ python-defaults (2.7.3-3) UNRELEASED; urgency=low - * dh_python2: no longer sensitive to trailing slash in private dir names - (closes: #686358) + * dh_python2: + - no longer sensitive to trailing slash in private dir names + (closes: #686358) + - ignore /usr/bin/python3 shebangs in all packages, not just in + python3-* ones + - TODO: parse interpreter version number from --shebang option and add + apropriate dependency/rt* script arguments -- Piotr Ożarowski <piotr@debian.org> Fri, 31 Aug 2012 18:06:26 +0200 diff --git a/debpython/tools.py b/debpython/tools.py index 75e8704..7cd6e27 100644 --- a/debpython/tools.py +++ b/debpython/tools.py @@ -33,7 +33,7 @@ from debpython.version import RANGE_PATTERN, getver, get_requested_versions log = logging.getLogger(__name__) EGGnPTH_RE = re.compile(r'(.*?)(-py\d\.\d(?:-[^.]*)?)?(\.egg-info|\.pth)$') -SHEBANG_RE = re.compile(r'^#!\s*(.*?/bin/.*?)(python(\d+\.\d+)?(?:-dbg)?)(?:\s(.*))?') +SHEBANG_RE = re.compile(r'^#!\s*(.*?/bin/.*?)(python(2\.\d+)?(?:-dbg)?)(?:\s(.*))?$') SHAREDLIB_RE = re.compile(r'NEEDED.*libpython(\d\.\d)') INSTALL_RE = re.compile(r""" (?P<pattern>.+?) # file pattern -- GitLab