--- builds_bin/update_repos	2014/10/10 15:46:43	1.77
+++ builds_bin/update_repos	2016/03/05 15:57:15	1.79
@@ -129,6 +129,11 @@ foreach my $ver ( sort { $a <=> $b } key
     %sources = ();
     %base = ();
 
+    @{$distrepo->{$ver}->{all_archs}} = ('noarch', @{$distrepo->{$ver}->{'archs'}});
+    if ( grep $_ eq 'i386', @{$distrepo->{$ver}->{'archs'}} ) {
+        push @{$distrepo->{$ver}->{all_archs}}, ('i586', 'i686');
+    }
+
     foreach my $dir  ( sort { $repos->{$baserepo->{$b}}->{prio} <=> $repos->{$baserepo->{$a}}->{prio} || $a cmp $b } keys %$baserepo ) {
         my $bdir = $dir;
         $bdir =~ s/~S/$distrepo->{$ver}->{repo}/;
@@ -295,8 +300,7 @@ foreach my $ver ( sort { $a <=> $b } key
                         }
                     } elsif ( $repos->{$cmp->{repo}}->{stage} ) {
                         $cmp->{delete}++;
-                    } elsif ( $cmp->{src} || ( $cmp->{rpm}->arch =~ m{^(i[356]86)$} && grep $_ eq 'i386', @{$distrepo->{$ver}->{'archs'}} ) ||
-                              grep $_ eq $cmp->{rpm}->arch, @{$distrepo->{$ver}->{'archs'}} ) {
+                    } elsif ( $cmp->{src} || grep $_ eq $cmp->{rpm}->arch, @{$distrepo->{$ver}->{all_archs}} ) {
                         $srpm = $cmp if ! $srpm && $cmp->{src};
                         my $dest = $repos->{$track{repo}}->{prio} > $repos->{$devel2}->{prio} ? $track{repo} : $devel2;
                         $dest = pkgdest($cmp, $devel1, $dest, $rpms->{$base}->{rpms});
@@ -523,11 +527,11 @@ foreach my $ver ( sort { $a <=> $b } key
         }
     }
     unless ( $opts{t} ) {
-        foreach (@{$distrepo->{$ver}->{builds}})
+        foreach (@{$distrepo->{$ver}->{'builds'}})
         {
             finddepth(sub{rmdir}, "$_") if -d "$_";
         }
-        finddepth(sub{rmdir}, $distrepo->{$ver}->{community}) if -d "$distrepo->{$ver}->{community}";
+        finddepth(sub{rmdir}, $distrepo->{$ver}->{'community'}) if -d "$distrepo->{$ver}->{'community'}";
     }
 }