--- builds_bin/update_repos 2008/01/22 22:21:42 1.38 +++ builds_bin/update_repos 2008/02/29 17:04:11 1.41 @@ -48,8 +48,8 @@ my $repos = { 'smeos' => { 'smeextras' => { prio => 15, inc => 0, ver => 1, rel => 1 }, 'smeaddons' => { prio => 14, inc => 0, ver => 1, rel => 1 }, 'smecontribs' => { prio => 13, inc => 0, ver => 1, rel => 1 }, - 'smetest' => { prio => 12, inc => 0, ver => 2, rel => 2, devel => 2 }, - 'smedev' => { prio => 11, inc => 0, ver => 2, rel => 2, devel => 1 }, + 'smetest' => { prio => 12, inc => 0, ver => 2, rel => 3, devel => 2 }, + 'smedev' => { prio => 11, inc => 0, ver => 1, rel => 1, devel => 1 }, 'centos' => { prio => 10, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 }, 'epel' => { prio => 9, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 }, 'fedora-extras' => { prio => 8, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 }, @@ -95,13 +95,13 @@ if ( $opts{q} ) { } my $skippkg = { '7' => { 'centos' => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3', 'vim' ) }, - 'epel' => { map { $_ => 1 } ( 'clamav', 'perl-Razor-Agent' ) }, + 'epel' => { map { $_ => 1 } ( 'clamav', 'perl-Razor-Agent', 'perl-Text-Iconv', 'proftpd' ) }, 'rpmforge' => { map { $_ => 1 } ( 'perl-Test-Inline' ) }, 'atrpms' => { map { $_ => 1 } ( 'dovecot', 'trac', 'yum' ) }, }, '8' => { 'centos' => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) }, 'fedora' => { map { $_ => 1 } ( 'kernel-xen' ) }, - 'epel' => { map { $_ => 1 } ( 'clamav', 'perl-Razor-Agent', 'smolt' ) }, + 'epel' => { map { $_ => 1 } ( 'clamav', 'perl-Razor-Agent', 'proftpd', 'smolt' ) }, 'fedora-extras' => { map { $_ => 1 } ( 'dstat', 'gocr', 'horde', 'oidentd', 'perl-Test-Inline', 'perl-Razor-Agent', 'smolt' ) }, 'rpmforge' => { map { $_ => 1 } ( 'perl-Test-Inline' ) }, }, @@ -232,8 +232,9 @@ foreach my $smever ( sort { $a <=> $b } } $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo}; $cmp->{repo} = $dest; - if ( ! $cmp->{src} || $repos->{$dest}->{prio} > $repos->{$track{repo}}->{prio} ) { + if ( ! $cmp->{src} && $repos->{$dest}->{prio} > $repos->{$track{repo}}->{prio} ) { $track{repo} = $dest; + $track{svr} = $cmp->{svr}; } } if ( $cmp->{src} && $reposrc{$cmp->{repo}} ) {