add changes to support arch only uploads

[wannabuild.git] / lib / WB / QD.pm

diff --git a/lib/WB/QD.pm b/lib/WB/QD.pm
index 83527bc5f9775010f7cdfd7654621d12a954566b..3487a676332a2dcc2ac5d1ed01a5f86b73801195 100644 (file)
--- a/lib/WB/QD.pm
+++ b/lib/WB/QD.pm
@@ -49,6 +49,8 @@ sub readsourcebins {
             next unless $p->{'name'} and $p->{'version'};
             foreach my $tarch (split(/\s+/, $p->{'arch'})) {
                 $p->{'for-us'} = 1 if debarch_is($arch, $tarch);
+               # Arch: all hackery.
+               $p->{'for-us'} = 1 if $tarch eq 'all' and $arch eq 'amd64';
             }
 
             # ignore if package already exists with higher version
@@ -87,7 +89,8 @@ sub readsourcebins {
             #next if $pas->{$p->{'binary'}} && pasignore($pas->{$p->{'binary'}}, $arch);
 
             # only continue if it's arch-specific...
-            next if $p->{'arch'} eq 'all';
+           # Arch: all hackery.
+            next if $p->{'arch'} eq 'all' and $arch ne 'amd64';
 
             # annotate the source package if present, continue otherwise
             next unless $srcs->{$p->{'source'}};
@@ -107,6 +110,10 @@ sub readsourcebins {
 
     SRCS:
     for my $k (keys %$srcs) {
+#       if ($k eq 'r-bioc-abarray') {
+#      use Data::Dumper;
+#      print STDERR Dumper($srcs->{$k})
+#       }
         if ($srcs->{$k}->{'installed'}) {
             $srcs->{$k}->{'status'} = 'installed';
             delete $srcs->{$k}->{'installed'};
@@ -116,18 +123,22 @@ sub readsourcebins {
             $srcs->{$k}->{'status'} = 'uncompiled';
         }
         delete $srcs->{$k}->{'compiled'};
-        $srcs->{$k}->{'status'} = 'installed' if $srcs->{$k}->{'arch'} && $srcs->{$k}->{'arch'} eq 'all';
+        # $srcs->{$k}->{'status'} = 'installed' if $srcs->{$k}->{'arch'} && $srcs->{$k}->{'arch'} eq 'all';
         
         if (!$srcs->{$k}->{'for-us'} && $srcs->{$k}->{'status'} ne 'installed') {
             $srcs->{$k}->{'status'} = 'arch-not-in-arch-list';
         }
         delete $srcs->{$k}->{'for-us'};
 
-        if ($srcs->{$k}->{'arch'} eq 'all') {
-            $srcs->{$k}->{'status'} = 'arch-all-only';
-            delete $srcs->{$k}->{'arch'};
-            next;
-        }
+#       if ($k eq 'r-bioc-abarray') {
+#      use Data::Dumper;
+#      print STDERR Dumper($srcs->{$k})
+#       }
+#         if ($srcs->{$k}->{'arch'} eq 'all') {
+#             $srcs->{$k}->{'status'} = 'arch-all-only';
+#             delete $srcs->{$k}->{'arch'};
+#             next;
+#         }
         delete $srcs->{$k}->{'arch'};
         
         if (pasignore($pas->{'%'.$k}, $arch)) {