[Reproducible-builds] [dh-python] 76/183: pybuild→distutils: set --root only in install step (closes: 719434)

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dh-python.

commit 30e5d808a5589c10a8f6c0a1cf6d1d88f2e83820
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sun Aug 11 20:06:36 2013 +0200

    pybuild→distutils: set --root only in install step (closes: 719434)
---
 debian/changelog                   | 3 +++
 dhpython/build/plugin_distutils.py | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 307fa25..bd18d82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ dh-python (1.20130809-1) UNRELEASED; urgency=low
 
   * Do not translate X-Python{,3}-Version into Depends if there are no Python
     files in the package
+  * pybuild's distutils build plugin: set --root only in install step.
+    dh doesn't pass DESTDIR in other steps and hence files for single binary
+    packages ended in debian/tmp by default (closes: 719434)
 
  -- Piotr Ożarowski <piotr at debian.org>  Fri, 09 Aug 2013 15:55:11 +0200
 
diff --git a/dhpython/build/plugin_distutils.py b/dhpython/build/plugin_distutils.py
index 1500aa2..6d79ca5 100644
--- a/dhpython/build/plugin_distutils.py
+++ b/dhpython/build/plugin_distutils.py
@@ -47,8 +47,7 @@ def create_pydistutils_cfg(func):
                                'build-lib={}\n'.format(args['build_dir']),
                                '[install]\n',
                                'install-layout=deb\n',
-                               'install-lib={}\n'.format(args['install_dir']),
-                               'root={}\n'.format(args['destdir'])])
+                               'install-lib={}\n'.format(args['install_dir'])])
         context['ENV']['HOME'] = args['home_dir']
         return func(self, context, args, *oargs, **kwargs)
 
@@ -97,7 +96,7 @@ class BuildSystem(Base):
     @shell_command
     @create_pydistutils_cfg
     def install(self, context, args):
-        return '{interpreter} {setup_py} install {args}'
+        return '{interpreter} {setup_py} install --root {destdir} {args}'
 
     @shell_command
     @create_pydistutils_cfg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dh-python.git