From 501562353c546d58a08ba5e0652b7678538a2419 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 9 Jan 2007 22:07:16 +0000 Subject: [PATCH] Allow dpkg-buildpackage to properly override '-b' when passed after '-B'. Thanks to Julian Gilbey. Closes: #397479 --- ChangeLog | 5 +++++ debian/changelog | 2 ++ scripts/dpkg-buildpackage.sh | 5 ++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d53a68d1..0a603048 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-10 Julian Gilbey + + * scripts/dpkg-buildpackage.sh: Allow '-b' to properly override a + previously passed '-B'. + 2007-01-09 Guillem Jover * configure.ac: Bump version to 1.14.0~. diff --git a/debian/changelog b/debian/changelog index 124b6c71..f9722ce5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ dpkg (1.14.0) UNRELEASED; urgency=low [ Guillem Jover ] * Make the copyright information in dpkg-deb.1 and dpkg-split.1 match the one in the source. Thanks to Nicolas François. Closes: #379320 + * Allow dpkg-buildpackage to properly override '-b' when passed after '-B'. + Thanks to Julian Gilbey. Closes: #397479 -- Guillem Jover Tue, 9 Jan 2007 22:48:47 +0200 diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh index 571863c1..fbd3ae0d 100755 --- a/scripts/dpkg-buildpackage.sh +++ b/scripts/dpkg-buildpackage.sh @@ -109,7 +109,10 @@ do -tc) cleansource=true ;; -t*) targetgnusystem="$value" ;; # Order DOES matter! -nc) noclean=true; if [ -z "$binaryonly" ]; then binaryonly=-b; fi ;; - -b) binaryonly=-b; [ "$sourceonly" ] && \ + -b) binaryonly=-b; + checkbuilddep_args=''; + binarytarget=binary; + [ "$sourceonly" ] && \ { echo >&2 "$progname: cannot combine $1 and -S" ; exit 2 ; } ;; -B) binaryonly=-B; checkbuilddep_args=-B; binarytarget=binary-arch; [ "$sourceonly" ] && \ { echo >&2 "$progname: cannot combine $1 and -S" ; exit 2 ; } ;; -- 2.39.5