Matt Brown <[EMAIL PROTECTED]> writes: > Michael Banck wrote: > >> If so, it should maybe be made an official config option perhaps. >> This is clearly not useful for buildds (at least the official >> ones), so this is our decision I guess.
> Whether that option is on the command line or in the configuration
> file is not important.
The attached patch makes this a config option as well. Is this OK to
apply?
Regards,
Roger
--
Roger Leigh
Printing on GNU/Linux? http://gutenprint.sourceforge.net/
Debian GNU/Linux http://www.debian.org/
GPG Public Key: 0x25BFB848. Please sign and encrypt your mail.
Index: sbuild
===================================================================
RCS file: /cvsroot/buildd-tools/sbuild/sbuild,v
retrieving revision 1.111
diff -u -r1.111 sbuild
--- sbuild 28 Mar 2006 22:02:36 -0000 1.111
+++ sbuild 29 Mar 2006 11:49:46 -0000
@@ -57,6 +57,7 @@
$chroot_mode = "split";
@ignore_watches_no_build_deps = qw();
$sbuild_mode = "buildd";
+$force_orig_source = 0;
%individual_stalled_pkg_timeout = ();
$path = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin:/usr/games";
# read conf files
@@ -115,7 +116,6 @@
$main::auto_giveback = 0;
$main::build_arch_all = 0;
$main::build_source = 0;
-$main::force_build_source = 0;
$main::jobs_file = "build-progress";
$main::max_lock_trys = 120;
$main::lock_interval = 5;
@@ -193,7 +193,7 @@
$main::build_source++;
}
elsif (/^--force-orig-source$/) {
- $main::force_build_source++;
+ $conf::force_orig_source++;
}
elsif (/^-d/ || /^--dist/) {
if (/^-d(.)/ || /^--dist=(.)/) {
@@ -843,7 +843,7 @@
open( STDIN, "</dev/null" );
setsid;
my $binopt = $main::build_source ?
- $main::force_build_source ? "-sa" : "" :
+ $conf::force_orig_source ? "-sa" : "" :
$main::build_arch_all ? "-b" : "-B";
if ($main::chroot_dir) {
Index: example.sbuildrc
===================================================================
RCS file: /cvsroot/buildd-tools/sbuild/example.sbuildrc,v
retrieving revision 1.5
diff -u -r1.5 example.sbuildrc
--- example.sbuildrc 11 Mar 2006 22:59:36 -0000 1.5
+++ example.sbuildrc 29 Mar 2006 11:49:46 -0000
@@ -42,6 +42,12 @@
# cint => 300
#);
+# By default, the -s option only includes the .orig.tar.gz when needed
+# (i.e. when the Debian revision is 0 or 1). By setting this option
+# to 1, the .orig.tar.gz will always be included when -s is used.
+# This is equivalent to --force-orig-source.
+#$force_orig_source = 0;
+
# don't remove this, Perl needs it:
1;
pgpUk7j4pp10w.pgp
Description: PGP signature
