[Reproducible-commits] [dpkg] 25/54: dpkg-checkbuilddeps: Exit with 1 on unsatisfied dependencies

Mattia Rizzolo mattia at debian.org
Fri Jan 15 18:54:01 UTC 2016


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

mattia pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit a1d208fa56300c8545207ddf30d2762e7bf0f5c4
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Nov 8 03:06:20 2015 +0100

    dpkg-checkbuilddeps: Exit with 1 on unsatisfied dependencies
    
    Regression introduced in commit d287060bb1a45f5de33eb27034a7d8b27b039dbb.
    
    We cannot rely on die's error code as it might be anything.
    
    Prompted-by: David Kalnischkies <david at kalnischkies.de>
---
 debian/changelog               | 2 ++
 scripts/dpkg-checkbuilddeps.pl | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c027d9..b286ac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ dpkg (1.18.4) UNRELEASED; urgency=low
     agnostic.
   * Add ‘.gitreview’ to the default dpkg-source ignore lists.
   * Add support for DPKG_MAINTSCRIPT_DEBUG environment variable to dpkg.
+  * Fix dpkg-checkbuilddeps exit code to be 1 instead of a random error value
+    on unsatisfied dependencies. Regression introduced in dpkg 1.18.3.
   * Test suite:
     - Improve perl code test coverage.
   * Build system:
diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index ee208bb..80b309f 100755
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -138,12 +138,12 @@ if ($bc_value) {
 }
 
 if (@unmet) {
-	error(g_('Unmet build dependencies: %s'),
-	      join(' ', map { $_->output() } @unmet));
+	errormsg(g_('Unmet build dependencies: %s'),
+	         join(' ', map { $_->output() } @unmet));
 }
 if (@conflicts) {
-	error(g_('Build conflicts: %s'),
-	      join(' ', map { $_->output() } @conflicts));
+	errormsg(g_('Build conflicts: %s'),
+	         join(' ', map { $_->output() } @conflicts));
 }
 exit 1 if @unmet || @conflicts;
 

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



More information about the Reproducible-commits mailing list