--- builds_bin/update_repos	2016/03/05 15:57:15	1.79
+++ builds_bin/update_repos	2016/03/08 10:49:22	1.82
@@ -45,7 +45,7 @@ my $distrepo = { '8' => { active    => 1
                           keyname   => 'SME Server 7 signing key <bugteam@contribs.org>',
                           checksum  => 'sha256',
                         },
-                 '10' => { active   => 0,
+                 '10' => { active   => 1,
                           centos    => 7,
                           archs     => [ 'x86_64' ],
                           repo      => '/build/smeserver/repo/testing/10/',
@@ -53,7 +53,7 @@ my $distrepo = { '8' => { active    => 1
                           community => '/build/builds/smeserver-10-contribs/',
                           stage     => '/build/smeserver/stage/10/',
                           sign      => 1,
-                          keyname   => 'SME Server 7 signing key <bugteam@contribs.org>',
+                          keyname   => 'Koozali SME Server signing key (10) <bugteam@koozali.org>',
                           checksum  => 'sha256',
                         },
                };
@@ -162,8 +162,16 @@ foreach my $ver ( sort { $a <=> $b } key
             }
             next unless -d $adir;
             opendir DIR, $adir or next;
-            process_rpm("$adir$_", $ver, $baserepo->{$dir}) foreach readdir DIR;
+            my @txt = grep {  /\.rpm$/ && -f "$adir/$_" }  readdir DIR;
             closedir DIR;
+            if (scalar(@txt)) {
+               opendir DIR, $adir or next;
+               process_rpm("$adir$_", $ver, $baserepo->{$dir})  foreach readdir DIR;
+               closedir DIR;
+            } elsif ($baserepo->{$dir} eq 'epel') {
+               # EPEL 7  uses a structure with subfolders of first letter of package
+	       find( { wanted => sub { process_rpm($_, $ver, $baserepo->{$dir}) if ($_ =~ m/\.rpm$/);}, no_chdir => 1, follow_fast => 1 }, $adir );
+            }
             last unless $dir =~ m{~A};
         }
     }
@@ -453,6 +461,9 @@ foreach my $ver ( sort { $a <=> $b } key
                         push @d, "${head}SRPMS/" . basename($pkg->{rpm}->filename);
                     } elsif ( $pkg->{rpm}->arch eq 'noarch' ) {
                         push @d, map { "${head}$_/$tail" . basename($pkg->{rpm}->filename) } @{$distrepo->{$ver}->{'archs'}};
+                    } elsif ($ver>=10 && $pkg->{rpm}->arch =~ m{^(i[356]86)$}  && $pkg->{arch} =~ m{^(x86_64)$}  ) {
+                       #add copy of i686 packages in x86_64 folder for SME>=10 
+                       push @d, map { "${head}$_/$tail" . basename($pkg->{rpm}->filename) } @{$distrepo->{$ver}->{'archs'}};
                     } elsif ( $pkg->{rpm}->arch =~ m{^(i[356]86)$} ) {
                         push @d, "${head}i386/$tail" . basename($pkg->{rpm}->filename);
                     } else {