The following commit has been merged in the master branch:
commit 9d1697bcc1ba87322a3ea6b2c7129656c52524de
Author: Raphael Hertzog <[email protected]>
Date: Sun May 17 19:16:48 2009 +0200
dpkg-buildpackage: error out properly when dpkg-checkbuilddeps is killed
Use the standard function subprocerr() to error out when
dpkg-checkbuilddeps has not exited normally. Otherwise interpret the exit
code as usual.
diff --git a/debian/changelog b/debian/changelog
index 66b1d7c..f95524d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -83,6 +83,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low
needed. Display a warning when it happens. Closes: #499088
* Allow to combine -nc and -S in dpkg-buildpackage but display a warning
saying that it's not advised. Closes: #304404
+ * Let dpkg-buildpackage error out with subprocerr() when dpkg-checkbuilddeps
+ is interrupted/killed by a signal. Closes: #498734
[ Guillem Jover ]
* Fix typo in dpkg output (‘unexecpted’ → ‘unexpected’). Closes: #519082
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 2f70b00..e5638a4 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -5,6 +5,7 @@ use warnings;
use Cwd;
use File::Basename;
+use POSIX;
use Dpkg;
use Dpkg::Gettext;
@@ -344,7 +345,10 @@ if ($checkbuilddep) {
push @checkbuilddep_args, "--admindir=$admindir";
}
- if (system('dpkg-checkbuilddeps', @checkbuilddep_args)) {
+ system('dpkg-checkbuilddeps', @checkbuilddep_args);
+ if (not WIFEXITED($?)) {
+ subprocerr('dpkg-checkbuilddeps');
+ } elsif (WEXITSTATUS($?)) {
warning(_g("Build dependencies/conflicts unsatisfied; aborting."));
warning(_g("(Use -d flag to override.)"));
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
