From af75da57b513ff5bf9c1fce5873932c9b749a9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr@debian.org>
Date: Sun, 12 Jun 2011 23:21:34 +0200
Subject: [PATCH] rename public_ext to ext (to avoid confusion in private dir
stats)
---
debpython/depends.py | 2 +-
dh_python2 | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/debpython/depends.py b/debpython/depends.py
index e74d68b..00dee4b 100644
--- a/debpython/depends.py
+++ b/debpython/depends.py
@@ -88,7 +88,7 @@ class Dependencies(object):
def parse(self, stats, options):
log.debug('generating dependencies for package %s', self.package)
- pub_vers = sorted(stats['public_vers'].union(stats['public_ext']))
+ pub_vers = sorted(stats['public_vers'].union(stats['ext']))
if pub_vers:
dbgpkg = self.package.endswith('-dbg')
tpl = 'python-dbg' if dbgpkg else 'python'
diff --git a/dh_python2 b/dh_python2
index f512ba7..33a922e 100755
--- a/dh_python2
+++ b/dh_python2
@@ -133,7 +133,7 @@ def share(package, stats, options):
# TODO: remove this once file conflicts will not be needed anymore
move_to_pyshared(sitedir(pubvers[0], package))
- for version in stats['public_ext']:
+ for version in stats['ext']:
create_ext_links(sitedir(version, package))
if options.guess_versions and pubvers:
@@ -141,7 +141,7 @@ def share(package, stats, options):
if version not in pubvers:
log.debug('guessing files for Python %s', vrepr(version))
versions_without_ext = debsorted(set(pubvers) -\
- stats['public_ext'])
+ stats['ext'])
if not versions_without_ext:
log.error('extension for python%s is missing. '
'Build extensions for all supported Python '
@@ -313,7 +313,7 @@ def scan(package, dname=None):
'public_vers': set(),
'private_dirs': {},
'compile': False,
- 'public_ext': set()}
+ 'ext': set()}
dbg_package = package.endswith('-dbg')
@@ -405,7 +405,7 @@ def scan(package, dname=None):
if fext == 'so':
(r if public_dir else
r['private_dirs'].setdefault(private_dir, {}))\
- .setdefault('public_ext', set()).add(version)
+ .setdefault('ext', set()).add(version)
continue
elif fext == 'py':
(r if public_dir else
@@ -590,7 +590,7 @@ def main():
args = pdir
- ext_for = details.get('public_ext')
+ ext_for = details.get('ext')
if ext_for is None: # no extension
if options.vrange and options.vrange != (None, None):
args += " -V %s" % vrange_str(options.vrange)
--
GitLab