add changes to support arch only uploads

[wannabuild.git] / bin / wanna-build

diff --git a/bin/wanna-build b/bin/wanna-build
index c9531211e54a03cff965eebc3fe617ea8539f7ba..f9edb04e76d926e18428042bcbac304b7f1285a2 100755 (executable)
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -21,7 +21,8 @@
 #
 use strict;
 use warnings;
-use 5.010;
+no warnings 'experimental';
+use v5.14;;
 
 die "wanna-build disabled" if -f "/org/wanna-build/NO-WANNA-BUILD";
 
@@ -41,6 +42,7 @@ die "mailprog binary $conf::mailprog does not exist or isn't executable\n"
        if !-x $conf::mailprog;
 package main;
 
+use feature "switch";
 use POSIX;
 use FileHandle;
 use File::Copy;
@@ -343,7 +345,7 @@ $list_order ||= $yamlmap->{"list-order"}{'default'};
 $api //= $yamlmap->{"api"};
 $api //= 0;
 
-if (isin($op_mode, qw<forget-user merge-v3 import>) && defined @conf::admin_users && !isin( $real_user, @conf::admin_users) && !$simulate ) {
+if (isin($op_mode, qw<forget-user merge-v3 import>) && @conf::admin_users && !isin( $real_user, @conf::admin_users) && !$simulate ) {
     die "This operation is restricted to admin users";
 }
 if (!isin($op_mode, qw<distribution-architectures distribution-aliases>)) {
@@ -403,6 +405,8 @@ undef $distribution if $distribution eq 'any';
                                 $$srcs->{$k} = $pkg;
                             }
                         }
+#                      use Data::Dumper;
+#                      print STDERR Dumper($srcs,$arch,$distribution);
                         parse_all_v3($$srcs, {'arch' => $arch, 'suite' => $distribution, 'time' => $curr_date});
                         # The packages passed to edos-debcheck are normally the binaries available,
                         # unless you've also a base suite the builder will take packages from.
@@ -2140,6 +2144,10 @@ sub parse_all_v3 {
 
     SRCS:
     foreach my $name (keys %$srcs) {
+#       if ($name eq 'r-bioc-abarray') {
+#      use Data::Dumper;
+#      print STDERR Dumper($srcs->{$name})
+#       }
         next if $name eq '_binary';
 
         # state = installed, out-of-date, uncompiled, packages-arch-specific, overwritten-by-arch-all, arch-not-in-arch-list, arch-all-only