[SCM] dpkg's main repository branch, master, updated. 1.14.16.6-35-gc7c725b

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 5e7918bc6f85a756e40c74a36a1df9274386d02c
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date:   Wed Jan 30 22:54:04 2008 +0100

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

diff --git a/ChangeLog b/ChangeLog
index e788580..3b0d1c7 100644
--- 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  <[EMAIL PROTECTED]>
+
+       * 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  <[EMAIL PROTECTED]>
 
        * utils/start-stop-daemon.c (do_help): Clarify --name and --user
diff --git a/debian/changelog b/debian/changelog
index 9c4f9ee..c4aad1d 100644
--- 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 <[EMAIL PROTECTED]>  Mon, 21 Jan 2008 10:11:55 +0200
+ -- Frank Lichtenheld <[EMAIL PROTECTED]>  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 7498d4f..72854dd 100755
--- 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;
+       }
     }
 }
 

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]