Procházet zdrojové kódy

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

Frank Lichtenheld před 18 roky
rodič
revize
5e7918bc6f
3 změnil soubory, kde provedl 19 přidání a 3 odebrání
  1. 6 0
      ChangeLog
  2. 5 1
      debian/changelog
  3. 8 2
      scripts/dpkg-buildpackage.pl

+ 6 - 0
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

+ 5 - 1
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
 

+ 8 - 2
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;
+	}
     }
 }