From: Bernd Zeimetz <bernd@bzed.de>
Date: Sat, 8 Aug 2009 01:32:48 +0000 (+0200)
Subject: python_distutils.pm: Support debhelper backports.
X-Git-Tag: 7.3.13~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=061bf3b1adffd2f668f3ae0a1eeb985cc8d00201;p=debhelper.git

python_distutils.pm: Support debhelper backports.

To allow backports of debhelper we don't pass
--install-layout=deb to 'setup.py install` for those Python
versions where the option is ignored by distutils/setuptools.
---

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 4838cad..9cf12e1 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -114,7 +114,10 @@ sub setup_py {
 	# Take into account that the default Python must not be in
 	# the requested Python versions.
 	# Then, run setup.py with each available python, to build
-        # extensions for each.
+	# extensions for each.
+	# To allow backports of debhelper we don't pass
+	# --install-layout=deb to 'setup.py install` for those Python
+	# versions where the option is ignored by distutils/setuptools.
 
         my $python_default = `pyversions -d`;
         $python_default =~ s/^\s+//;
@@ -139,7 +142,17 @@ sub setup_py {
 
 	foreach my $python (@python_requested, @python_dbg) {
 		if (-x "/usr/bin/".$python) {
-			$this->doit_in_sourcedir($python, "setup.py", $act, @_);
+			if ( $act eq "install" and not
+			     ( ($python =~ /^python(?:-dbg)?$/
+			         and $python_default =~ /^python2.[2345]$/)
+			      or $python =~ /^python2.[2345](?:-dbg)?$/ )) {
+				$this->doit_in_sourcedir($python, "setup.py",
+						$act, @_, "--install-layout=deb");
+			}
+			else {
+				$this->doit_in_sourcedir($python, "setup.py",
+						$act, @_);
+			}
 		}
 	}
 }
@@ -156,7 +169,6 @@ sub install {
 		"--root=$destdir",
 		"--no-compile",
 		"-O0",
-		"--install-layout=deb",
 		@_);
 }