[debhelper-devel] [debhelper] 10/12: python_distutils: Fix prefix setting when eos-app is not set

[Niels Thykier]

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

nthykier pushed a commit to annotated tag Version_9.20130630co2endless10
in repository debhelper.

commit bbd49a2989295ad7642f262e4076519368128780
Author: Dan Nicholson <nicholson at endlessm.com>
Date:   Wed Jul 16 22:28:54 2014 -0700

    python_distutils: Fix prefix setting when eos-app is not set
---
 Debian/Debhelper/Buildsystem/python_distutils.pm | 6 +++---
 debian/changelog                                 | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index d3890bd..eef2207 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -185,18 +185,18 @@ sub build {
 sub install {
 	my $this=shift;
 	my $destdir=shift;
-	my $prefix_opt="";
+	my @prefix_opt;
 	if (get_buildprofile("eos-app")) {
 		# Build with the app id of the main package by default
 		my $app_prefix=package_eos_app_id();
-		$prefix_opt="--prefix=/endless/" . $app_prefix;
+		push @prefix_opt, "--prefix=/endless/" . $app_prefix;
 	}
 	$this->setup_py("install",
 		"--force",
 		"--root=$destdir",
 		"--no-compile",
 		"-O0",
-		$prefix_opt,
+		@prefix_opt,
 		@_);
 }
 
diff --git a/debian/changelog b/debian/changelog
index 09dbddc..a7e0e69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (9.20130630co2endless8) eos; urgency=low
+
+  * Debian/Debhelper/Buildsystem/python_distutils.pm:
+    - Fix prefix setting when eos-app is not set.
+
+ -- Dan Nicholson <nicholson at endlessm.com>  Wed, 16 Jul 2014 22:28:54 -0700
+
 debhelper (9.20130630co2endless7) eos; urgency=low
 
   * Debian/Debhelper/Buildsystem/python_distutils.pm:

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