disable PyDist feature if dh_pydeb is in debian/rules

README.derivatives

@@ -21,7 +21,7 @@ How to change default Python version?
 * Open debpython/versions.py file and edit `DEFAULT` variable around line 27
 
 
-How to bump minimum required python version by dh_python2?
+How to bump minimum required Python version by dh_python2?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * Open debpython/depends.py file and edit `MINPYCDEP` variable around line 26

debian/changelog

-python-defaults (2.6.6-2) UNRELEASED; urgency=low
+python-defaults (2.6.6-2) experimental; urgency=low
 
   [ Piotr Ożarowski ]
   * Add README.derivatives (source package)
@@ -8,8 +8,8 @@ python-defaults (2.6.6-2) UNRELEASED; urgency=low
       PyDist feature)
     - if dist_fallback and `dpkg -S` fails to find the right package name,
       fall back to package name recommended by Debian Python Policy (use
-      debian/pydist-override file to override)
-    - TODO: disable PyDist feature if dh_pydeb is in debian/rules
+      debian/pydist-overrides file to override)
+    - disable PyDist feature if dh_pydeb is in debian/rules
   * Use versioned interpreter name rather than "python" only in
     python-minimal.postinst (closes: 595826)
 
@@ -19,7 +19,7 @@ python-defaults (2.6.6-2) UNRELEASED; urgency=low
   * python.mk (py_pkgname): New macro to refer the package name depending
     on the python version.
 
- -- Piotr Ożarowski <piotr@debian.org>  Thu, 02 Sep 2010 19:18:26 +0200
+ -- Piotr Ożarowski <piotr@debian.org>  Sun, 12 Sep 2010 18:41:04 +0200
 
 python-defaults (2.6.6-1) unstable; urgency=low
 

debpython/debhelper.py

@@ -24,7 +24,7 @@ import re
 from os import makedirs, chmod
 from os.path import exists, join, dirname
 
-log = logging.getLogger('dh_python')
+log = logging.getLogger(__name__)
 
 
 class DebHelper(object):

debpython/depends.py

@@ -24,7 +24,7 @@ from debpython.pydist import parse_pydep, guess_dependency
 from debpython.version import SUPPORTED, DEFAULT, debsorted, vrepr, vrange_str
 
 MINPYCDEP = 'python (>= 2.6.5-11~)'  # minumum version required for pycompile
-log = logging.getLogger('dh_python')
+log = logging.getLogger(__name__)
 
 
 class Dependencies(object):

debpython/pydist.py

@@ -28,7 +28,7 @@ from subprocess import PIPE, Popen
 from debpython.version import vrepr, getver, get_requested_versions
 from debpython.tools import memoize
 
-log = logging.getLogger('dh_python')
+log = logging.getLogger(__name__)
 
 PUBLIC_DIR_RE = re.compile(r'.*?/usr/lib/python(\d.\d+)/(site|dist)-packages')
 PYDIST_RE = re.compile(r"""

debpython/tools.py

@@ -26,7 +26,7 @@ from cPickle import dumps
 from os import symlink
 from debpython.version import getver
 
-log = logging.getLogger('dh_python')
+log = logging.getLogger(__name__)
 SHEBANG_RE = re.compile(r'^#!\s*/usr/bin/(?:env\s+)?(python(\d+\.\d+)?(?:-dbg)?).*')
 
 

dh_python2

@@ -46,7 +46,7 @@ from debpython.option import Option
 # initialize script
 logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: '
                            '%(message)s')
-log = logging.getLogger('dh_python')
+log = logging.getLogger(__name__)
 os.umask(022)
 EGGnPTH_RE = re.compile(r'(.*?)(-py\d\.\d+)?(.*?)(\.egg-info|\.pth)$')
 
@@ -450,6 +450,17 @@ def main():
                     options.vrange = parse_vrange(line)
                     break
 
+    # disable PyDist if dh_pydeb is used
+    if options.guess_deps:
+        try:
+            fp = open('debian/rules', 'r')
+        except IOError:
+            log.warning('cannot open debian/rules file')
+        else:
+            if re.compile('\n\s*dh_pydeb').search(fp.read()):
+                log.warning('dh_pydeb detected, PyDist feature disabled')
+                options.guess_deps = False
+
     private_dir = None if not args else args[0]
     # TODO: support more than one private dir at the same time (see :meth:scan)
     if options.skip_private: