dpkg-buildpackage: Warn about unsatisfied build-depends during -S

diff --git a/ChangeLog b/ChangeLog
index e78858013be2e0d157300acf668697f1cb54351b..3b0d1c7af303c577bbe0e762e7df9131370bb1ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
        * scripts/dpkg-genchanges.pl: Always list all binary packages in
        the Description field of generated .changes files.
 
+2008-01-30  Frank Lichtenheld  <djpig@debian.org>
+
+       * scripts/dpkg-buildpackage.pl: Warn if build-dependencies
+       are not satisfied during -S. Also warn that this might become
+       an error in the future.
+
 2008-01-30  Justin Pryzby  <jpryzby+d@quoininc.com>
 
        * utils/start-stop-daemon.c (do_help): Clarify --name and --user

diff --git a/debian/changelog b/debian/changelog
index 9c4f9eef9a0d2b4e601891858cc4c30720c05d78..c4aad1d16837e9f007f4603032d1b0b301fa2522 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,10 @@ dpkg (1.14.17) UNRELEASED; urgency=low
     on source only uploads to display short description of what the package is
     about.
 
+  [ Frank Lichtenheld ]
+  * Add a warning in dpkg-buildpackage if the build-dependencies are not
+    satisfied during -S. Closes: #445552
+
   [ Updated manpages translations ]
   * German (Helge Kreutzmann).
 
@@ -33,7 +37,7 @@ dpkg (1.14.17) UNRELEASED; urgency=low
   * German (Helge Kreutzmann).
   * Swedish (Peter Karlsson).
 
- -- Guillem Jover <guillem@debian.org>  Mon, 21 Jan 2008 10:11:55 +0200
+ -- Frank Lichtenheld <djpig@debian.org>  Wed, 30 Jan 2008 22:50:05 +0100
 
 dpkg (1.14.16.6) unstable; urgency=medium
 

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 7498d4fed59cd1a6741ce3cf3238e583fe280b2b..72854dda52208f8be26e948fd63c3884f23d6c75 100755 (executable)
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -179,7 +179,7 @@ while (@ARGV) {
        }
     } elsif (/^-S$/) {
        $sourceonly = '-S';
-       $checkbuilddep = 0;
+       @checkbuilddep_args = ('-B');
        if ($binaryonly) {
            usageerr(_g("cannot combine %s and %s"), $binaryonly, '-S');
        }
@@ -307,7 +307,13 @@ if ($checkbuilddep) {
     if (system('dpkg-checkbuilddeps', @checkbuilddep_args)) {
        warning(_g("Build dependencies/conflicts unsatisfied; aborting."));
        warning(_g("(Use -d flag to override.)"));
-       exit 3;
+
+       if ($sourceonly) {
+           warning(_g("This is currently a non-fatal warning with -S, but"));
+           warning(_g("will probably become fatal in the future."));
+       } else {
+           exit 3;
+       }
     }
 }