Skip to content
Snippets Groups Projects
Commit 847b44f2 authored by Piotr Ożarowski's avatar Piotr Ożarowski
Browse files

fix regression from rev. 338 - parsing shebang from string with newlines works fine again

parent 73e5a45e
No related branches found
No related tags found
No related merge requests found
python-defaults (2.7.3-3) UNRELEASED; urgency=low python-defaults (2.7.3-3) unstable; urgency=low
[ Piotr Ożarowski ] [ Piotr Ożarowski ]
* dh_python2: * dh_python2:
...@@ -8,8 +8,6 @@ python-defaults (2.7.3-3) UNRELEASED; urgency=low ...@@ -8,8 +8,6 @@ python-defaults (2.7.3-3) UNRELEASED; urgency=low
python3-* ones python3-* ones
- generates correct "python (<< 2.X)" dependencies for packages with - generates correct "python (<< 2.X)" dependencies for packages with
private Python extensions (typo fixed) private Python extensions (typo fixed)
- TODO: parse interpreter version number from --shebang option and add
apropriate dependency/rt* script arguments
* pyversions.py: fix parsing DEBPYTHON_SUPPORTED env. variable * pyversions.py: fix parsing DEBPYTHON_SUPPORTED env. variable
(versions should be separated using comma, as in debian_defaults (versions should be separated using comma, as in debian_defaults
config file) config file)
...@@ -18,7 +16,7 @@ python-defaults (2.7.3-3) UNRELEASED; urgency=low ...@@ -18,7 +16,7 @@ python-defaults (2.7.3-3) UNRELEASED; urgency=low
* debian/python.{pre,post}rm.in: Handle purge command the same way as * debian/python.{pre,post}rm.in: Handle purge command the same way as
remove (thanks to Mitsuya Shibata for the bug report) remove (thanks to Mitsuya Shibata for the bug report)
-- Piotr Ożarowski <piotr@debian.org> Fri, 31 Aug 2012 18:06:26 +0200 -- Piotr Ożarowski <piotr@debian.org> Sun, 21 Oct 2012 22:40:55 +0200
python-defaults (2.7.3-2) unstable; urgency=low python-defaults (2.7.3-2) unstable; urgency=low
......
...@@ -33,7 +33,7 @@ from debpython.version import RANGE_PATTERN, getver, get_requested_versions ...@@ -33,7 +33,7 @@ from debpython.version import RANGE_PATTERN, getver, get_requested_versions
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
EGGnPTH_RE = re.compile(r'(.*?)(-py\d\.\d(?:-[^.]*)?)?(\.egg-info|\.pth)$') EGGnPTH_RE = re.compile(r'(.*?)(-py\d\.\d(?:-[^.]*)?)?(\.egg-info|\.pth)$')
SHEBANG_RE = re.compile(r'^#!\s*(.*?/bin/.*?)(python(2\.\d+)?(?:-dbg)?)(?:\s(.*))?$') SHEBANG_RE = re.compile(r'^#!\s*(.*?/bin/.*?)(python(2\.\d+)?(?:-dbg)?)(?:\s(.*))?[$\r\n].*')
SHAREDLIB_RE = re.compile(r'NEEDED.*libpython(\d\.\d)') SHAREDLIB_RE = re.compile(r'NEEDED.*libpython(\d\.\d)')
INSTALL_RE = re.compile(r""" INSTALL_RE = re.compile(r"""
(?P<pattern>.+?) # file pattern (?P<pattern>.+?) # file pattern
......
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