From 02a9b23e3d82c07b3c7fa533e8169ed76f6af60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <ozarow@gmail.com>
Date: Mon, 17 May 2010 22:45:11 +0200
Subject: [PATCH] generate rtscript only if there are .py files to bytecompile
---
debpython/version.py | 2 +-
dh_python | 18 +++++++++++-------
pyclean | 3 ++-
pycompile | 5 +++--
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/debpython/version.py b/debpython/version.py
index 2f3ab9c..4bd3fa7 100644
--- a/debpython/version.py
+++ b/debpython/version.py
@@ -229,7 +229,7 @@ def getver(value):
"""
if not value:
return ''
- return tuple(int(i) for i in value.split('.'))[:2]
+ return tuple(int(i) for i in value.split('.', 2))[:2]
def debsorted(versions, return_str=None):
diff --git a/dh_python b/dh_python
index 944d602..473a106 100755
--- a/dh_python
+++ b/dh_python
@@ -41,7 +41,7 @@ from debpython.tools import sitedir, relative_symlink, guess_dependency, \
from debpython.option import Option
# initialize script
-logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: ' +\
+logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: '
'%(message)s')
log = logging.getLogger('dh_python')
os.umask(022)
@@ -382,19 +382,21 @@ def dependencies(package, stats, options):
depends.append(interpreter)
# TODO: if versions[0] not in requested_versions: FTBFS
else: # no hardcoded versions
- dep = ''
+ dep = args = ''
vr = options.vrange
if vr:
- args = "-V %s" % vrange_str(vr)
- for pattern in options.regexpr or []:
- args += " -X '%s'" % pattern.replace("'", r"\'")
- rtscripts.append((private_dir, args))
-
+ args += "-V %s" % vrange_str(vr)
if vr[0]: # minumum version specified
dep = "python (>= %s)" % vrepr(vr[0])
if vr[1]: # maximum version specified
dep += ", python (<< %s)" % vrepr(vr[1])
dep = dep.lstrip(', ')
+
+ if details.get('compile', False):
+ for pattern in options.regexpr or []:
+ args += " -X '%s'" % pattern.replace("'", r"\'")
+ rtscripts.append((private_dir, args))
+
dep = dep or 'python'
if dep not in depends:
depends.append(dep)
@@ -432,6 +434,8 @@ def parse_pydep(fname):
################################################################
def main():
+ if exists('debian/pycompat'):
+ sys.exist(0) # be compatible with old dh_python
usage = '%prog -p PACKAGE [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]\n'
parser = OptionParser(usage, version='%prog 2.0~alpha1',
option_class=Option)
diff --git a/pyclean b/pyclean
index 9763652..d3db300 100755
--- a/pyclean
+++ b/pyclean
@@ -34,7 +34,8 @@ from debpython.version import SUPPORTED
# initialize script
-logging.basicConfig()
+logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: '
+ '%(message)s')
log = logging.getLogger('pyclean')
"""TODO: move it to manpage
diff --git a/pycompile b/pycompile
index fa0d041..d405e98 100755
--- a/pycompile
+++ b/pycompile
@@ -35,9 +35,10 @@ from debpython.version import SUPPORTED, DEFAULT, debsorted, vrepr, \
from debpython.option import Option, compile_regexpr
# initialize script
-logging.basicConfig()
+logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: '
+ '%(message)s')
log = logging.getLogger('pycompile')
-# TODO: /usr/share/python2/foo/2.5-/bar/-2.7/baz.py
+# TODO: /usr/share/python3/foo/3.1-/bar/-3.5/baz.py
STDINS = {}
"""TODO: move it to manpage
--
GitLab