On Fri, Jan 18, 2008 at 04:02:56PM +0100, Raphael Hertzog wrote:
> Alternatively, we could make it display a warning and not actually exit.
> And this warning can itself warn that in the future it might fail at that
> point if -d is not passed.

At some point I would like to introduce a configuration file for
dpkg-buildpackage so that one can define his own preferred behaviour
(no more -uc -us, looking forward to that...)

For now how about this patch that implements that compromise solution
you described:

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 8865299..48db1c8 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -177,7 +177,7 @@ while (@ARGV) {
        }
     } elsif (/^-S$/) {
        $sourceonly = '-S';
-       $checkbuilddep = 0;
+       @checkbuilddep_args = ('-B');
        if ($binaryonly) {
            usageerr(_g("cannot combine %s and %s"), $binaryonly, '-S');
        }
@@ -297,7 +297,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;
+       }
     }
 }
 

Gruesse,
-- 
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/



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

Reply via email to