From eb6e5e265d661f6bd741ff474874e796baeff088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr@debian.org>
Date: Sat, 15 Jan 2011 21:17:05 +0100
Subject: [PATCH] dh_python2: fix parsing .pyinstall files (a space between
file name and module name is now required)
---
debian/changelog | 7 +++++++
debpython/tools.py | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 7404d34..ac15879 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-defaults (2.6.6-11) UNRELEASED; urgency=low
+
+ * dh_python2: fix parsing .pyinstall files (a space between file name and
+ module name is now required)
+
+ -- Piotr Ożarowski <piotr@debian.org> Sat, 15 Jan 2011 21:14:38 +0100
+
python-defaults (2.6.6-10) experimental; urgency=low
* dh_python2: fix moving files from old debug locations (due to typo)
diff --git a/debpython/tools.py b/debpython/tools.py
index 0962ccf..8e97867 100644
--- a/debpython/tools.py
+++ b/debpython/tools.py
@@ -35,7 +35,7 @@ EGGnPTH_RE = re.compile(r'(.*?)(-py\d\.\d(?:-[^.]*)?)?(\.egg-info|\.pth)$')
SHEBANG_RE = re.compile(r'^#!\s*/usr/bin/(?:env\s+)?(python(\d+\.\d+)?(?:-dbg)?).*')
INSTALL_RE = re.compile(r"""
(?P<pattern>.+?) # file pattern
- \s* # optional Python module name:
+ \s+ # optional Python module name:
(?P<module>[A-Za-z][A-Za-z0-9_.]*)?
\s* # optional version range:
(?P<vrange>%s)?$
--
GitLab