X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=ec0ea582b01de923c38b8f822263d5d7424f827f;hb=647299ea5b0e30664d236d924bc50f17de3c7718;hp=0d24fd1485ddbc0630727b2e95cfabf0be1cdf7a;hpb=ea234b3b19c322bfe93298f563091d1c87890420;p=wannabuild.git

diff --git a/bin/wanna-build b/bin/wanna-build
index 0d24fd1..ec0ea58 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -25,7 +25,7 @@ $basedir ||= "/var/lib/debbuild";
 $dbbase ||= "build-db";
 $transactlog ||= "transactions.log";
 $mailprog ||= "/usr/sbin/sendmail";
-require "/etc/wanna-build.conf";
+require "/org/wanna-build/etc/wanna-build.conf";
 die "$conf::basedir is not a directory\n" if ! -d $conf::basedir;
 die "dbbase is empty\n" if ! $dbbase;
 die "transactlog is empty\n" if ! $transactlog;
@@ -39,6 +39,7 @@ use POSIX;
 use FileHandle;
 use File::Copy;
 use DBI;
+use lib '/org/wanna-build/bin';
 use WannaBuild;
 
 our ($verbose, $mail_logs, $list_order, $list_state,
@@ -937,7 +938,8 @@ sub add_one_needsbuild {
 		}
 	}
 	if (defined ($pkg->{'builder'}) && $user ne $pkg->{'builder'} &&
-		    !($pkg->{'builder'} =~ /^(\w+)-\w+/ && $1 eq $user)) {
+		!($pkg->{'builder'} =~ /^(\w+)-\w+/ && $1 eq $user) &&
+		!$opt_override) {
 		print "$name: not taken by you, but by ".
 			  "$pkg->{'builder'}. Skipping.\n";
 		return;
@@ -1858,6 +1860,7 @@ sub info_packages {
 			foreach $key (sort keys %$pkg) {
 				next if isin( $key, @firstkeys );
 				my $val = $pkg->{$key};
+				next if !defined($val);
 				chomp( $val );
 				$val = "\n$val" if isin( $key, qw(Failed Old-Failed));
 				$val =~ s/\n/\n    /g;
@@ -2347,6 +2350,7 @@ sub usage {
 Usage: $prgname <options...> <package_version...>
 Options:
     -v, --verbose: Verbose execution.
+    -A arch: Architecture this operation is for.
     --take: Take package for building [default operation]
     -f, --failed: Record in database that a build failed due to
         deficiencies in the package (that aren't fixable without a new