rollback

[wannabuild.git] / bin / wanna-build

diff --git a/bin/wanna-build b/bin/wanna-build
index 54f3db79568c6dd83872be61e28834e071280276..2058f0616b102e7c7c1eeb105de8606e3e9b50eb 100755 (executable)
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -84,9 +84,6 @@ my %prognames = ( "uploaded-build"  => "set-uploaded",
                                  "give-back-build" => "set-needs-build",
                                  "dep-wait-build"  => "set-dep-wait",
                                  "forget-build"        => "forget",
-                                 "merge-quinn"         => "merge-quinn",
-                                 "merge-packages"  => "merge-packages",
-                                 "merge-sources"   => "merge-sources",
                                  "build-info"          => "info" );
 
 %short_category = ( u => "uploaded-fixed-pkg",
@@ -137,13 +134,13 @@ my %options =
         "dep-wait"             => { mode => "set-dep-wait" },
         forget                 => { mode => "forget" },
         'forget-user' => { mode => 'forget-user' },
-        "merge-quinn"  => { mode => "merge-quinn" },
-        "merge-partial-quinn" => { mode => "merge-partial-quinn" },
-        "merge-packages" => { mode => "merge-packages" },
-        "merge-sources" => { mode => "merge-sources" },
+        #"merge-quinn"  => { mode => "merge-quinn" },
+        #"merge-partial-quinn" => { mode => "merge-partial-quinn" },
+        #"merge-packages" => { mode => "merge-packages" },
+        #"merge-sources" => { mode => "merge-sources" },
         "pretend-avail" => { short => "p", mode => "pretend-avail" },
-        "merge-all"     => { mode => "merge-all" },
-        "merge-all-secondary" => { mode => "merge-all-secondary" },
+        #"merge-all"     => { mode => "merge-all" },
+        #"merge-all-secondary" => { mode => "merge-all-secondary" },
         "merge-v3"      => { mode => "merge-v3" },
         info                   => { short => "i", mode => "info" },
         'binNMU' => { mode => 'set-binary-nmu', arg => \$binNMUver, 
@@ -368,7 +365,7 @@ END {
 }
 
 my $schema_suffix = '';
-if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /-/) && !($privmode eq 'yes')) {
+if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /buildd-/) && !($privmode eq 'yes')) {
        $dbh = DBI->connect("DBI:Pg:service=wanna-build") || 
                die "FATAL: Cannot open database: $DBI::errstr\n";
        $schema_suffix = '_public';
@@ -546,7 +543,7 @@ sub process {
 
                die "Unexpected operation mode $op_mode\n";
        }
-       if (not -t and $user =~ /-/) {
+       if (not -t and $user =~ /buildd-/) {
                my $userinfo = get_user_info($user);
                if (!defined $userinfo)
                {
@@ -2809,6 +2806,7 @@ sub get_all_source_info {
 
 sub update_source_info {
        my $pkg = shift;
+        print Dumper $pkg if $verbose and $simulate;
         return if $simulate;
 
        my $pkg2 = get_source_info($pkg->{'package'});
@@ -3031,8 +3029,8 @@ sub parse_all_v3() {
         $pkg->{'dep'} = $pkgs->{'depends'};
         $pkg->{'conf'} = $pkgs->{'conflicts'};
         delete $pkg->{'builder'};
-        delete $pkg->{'binary_nmu_version'};
-        delete $pkg->{'binary_nmu_changelog'};
+        delete $pkg->{'binary_nmu_version'} unless $pkgs->{'binnmu'};
+        delete $pkg->{'binary_nmu_changelog'} unless $pkgs->{'binnmu'};
         log_ta( $pkg, "--merge-v3: needs-build" ) unless $simulate;
         update_source_info($pkg) unless $simulate;
         print "$logstr set to needs-builds\n" if $simulate || $verbose;