From f79ed4ddd81b299fe9b7aab55c0ef01b89989910 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 22 Oct 2012 16:07:28 -0400 Subject: adjust other fix This is really atrocious, but IIRC the order pythons are run in matters, so the earlier mangling of @python_requested must remain, and so unmangle it here. --- Debian/Debhelper/Buildsystem/python_distutils.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Debian/Debhelper/Buildsystem') diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm index 81cff3c9..fd317306 100644 --- a/Debian/Debhelper/Buildsystem/python_distutils.pm +++ b/Debian/Debhelper/Buildsystem/python_distutils.pm @@ -155,7 +155,14 @@ sub setup_py { } foreach my $python (@python_dbg, @python_requested) { - if (-f "/usr/lib/$python/distutils/__init__.py") { + my $python_with_version = $python; + if ($python eq "python") { + $python_with_version = $python_default; + } + elsif ($python eq "python-dbg") { + $python_with_version = $python_default."-dbg"; + } + if (-f "/usr/lib/$python_with_version/distutils/__init__.py") { # To allow backports of debhelper we don't pass # --install-layout=deb to 'setup.py install` for # those Python versions where the option is -- cgit v1.2.3