--- builds_bin/update_repos 2010/04/08 20:03:57 1.56 +++ builds_bin/update_repos 2010/07/24 15:28:38 1.58 @@ -96,9 +96,10 @@ my $skippkg = { '7' => { 'centos' 'rpmforge' => { map { $_ => 1 } ( 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) }, 'atrpms' => { map { $_ => 1 } ( 'check4updates', 'dovecot', 'trac', 'yum' ) }, }, - '8' => { 'centos' => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) }, + '8' => { 'atrpms' => { map { $_ => 1 } ( 'gnupg' ) }, + 'centos' => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) }, 'epel' => { map { $_ => 1 } ( 'clamav', 'horde', 'libtalloc', 'libtdb', 'perl-Compress-Bzip2', 'perl-Compress-Raw-Zlib', 'perl-Compress-Raw-Bzip2', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-Razor-Agent', 'proftpd', 'smolt' ) }, - 'rpmforge' => { map { $_ => 1 } ( 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) }, + 'rpmforge' => { map { $_ => 1 } ( 'libtalloc', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) }, }, }; @@ -400,11 +401,19 @@ foreach my $ver ( sort { $a <=> $b } key chomp $dir; print "rebuild $repo/$arch\n"; unless ( $opts{t} ) { - if ( -f "$dir/repodata/comps.xml" ) { - qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm --groupfile repodata/comps.xml $dir); - } else { - qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm $dir); - } + if ( $dir =~ m{test/|-testing/} ) { + if ( -f "$dir/repodata/comps.xml" ) { + qx(createrepo --update --database --exclude *smeserver-release*.rpm --exclude *.src.rpm --exclude *-debuginfo-*.rpm --groupfile repodata/comps.xml $dir); + } else { + qx(createrepo --update --database --exclude *smeserver-release*.rpm --exclude *.src.rpm --exclude *-debuginfo-*.rpm $dir); + } + } else { + if ( -f "$dir/repodata/comps.xml" ) { + qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm --groupfile repodata/comps.xml $dir); + } else { + qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm $dir); + } + } qx(repoview $dir); qx(rm -rf $dir/.olddata) if -d "$dir/.olddata"; qx(rm -rf $dir/.repodata) if -d "$dir/.repodata";