--- builds_bin/update_repos 2014/08/15 15:29:42 1.75 +++ builds_bin/update_repos 2014/10/10 14:07:52 1.76 @@ -23,85 +23,98 @@ my $osdir = 'SME'; my $disttag = 'sme'; my $repotag = 'sme'; -my @archs = ( 'i386', 'x86_64' ); - my $distrepo = { '8' => { active => 1, - centos => 5, - repo => '/build/smeserver/repo/8/', - builds => ['/build/builds/smeserver-8-core/'], - community => '/build/builds/smeserver-8-contribs/', - stage => '/build/smeserver/stage/8/', - sign => 1, + centos => 5, + archs => [ 'i386', 'x86_64' ], + repo => '/build/smeserver/repo/8/', + builds => ['/build/builds/smeserver-8-core/'], + community => '/build/builds/smeserver-8-contribs/', + stage => '/build/smeserver/stage/8/', + sign => 1, + keyname => 'SME Server 7 signing key ', + checksum => 'sha', + }, + '9' => { active => 1, + centos => 6, + archs => [ 'i386', 'x86_64' ], + repo => '/build/smeserver/repo/9/', + builds => ['/build/builds/smeserver-9-core/'], + community => '/build/builds/smeserver-9-contribs/', + stage => '/build/smeserver/stage/9/', + sign => 1, keyname => 'SME Server 7 signing key ', - checksum => 'sha', - }, - '9' => { active => 1, - centos => 6, - repo => '/build/smeserver/repo/9/', - builds => ['/build/builds/smeserver-9-core/'], - community => '/build/builds/smeserver-9-contribs/', - stage => '/build/smeserver/stage/9/', - sign => 1, + checksum => 'sha256', + }, + '10' => { active => 0, + centos => 7, + archs => [ 'x86_64' ], + repo => '/build/smeserver/repo/testing/10/', + builds => ['/build/builds/smeserver-10-core/'], + community => '/build/builds/smeserver-10-contribs/', + stage => '/build/smeserver/stage/10/', + sign => 1, keyname => 'SME Server 7 signing key ', - checksum => 'sha256', - }, - }; + checksum => 'sha256', + }, + }; my $repos = { "${repotag}os" => { prio => 19, inc => 1, ver => 1, rel => 1, os => 1 }, - "${repotag}updates" => { prio => 18, inc => 1, ver => 1, rel => 1 }, - "${repotag}updates-testing" => { prio => 17, inc => 1, ver => 1, rel => 3 }, - "${repotag}extras" => { prio => 16, inc => 0, ver => 1, rel => 1 }, - "${repotag}addons" => { prio => 15, inc => 0, ver => 1, rel => 1 }, - "${repotag}contribs" => { prio => 14, inc => 0, ver => 1, rel => 1 }, - "${repotag}test" => { prio => 13, inc => 0, ver => 2, rel => 3, devel => 2 }, - "${repotag}dev" => { prio => 12, 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 }, - 'rpmforge' => { prio => 7, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 }, - 'atrpms' => { prio => 6, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 }, - 'builds' => { prio => 4, inc => 0, ver => 0, rel => 0, orig => 1 }, - 'community' => { prio => 2, inc => 0, ver => 0, rel => 0, orig => 1 }, - 'stage' => { prio => 1, inc => 0, ver => 0, rel => 0, stage => 1, os => 1 }, - }; + "${repotag}updates" => { prio => 18, inc => 1, ver => 1, rel => 1 }, + "${repotag}updates-testing" => { prio => 17, inc => 1, ver => 1, rel => 3 }, + "${repotag}extras" => { prio => 16, inc => 0, ver => 1, rel => 1 }, + "${repotag}addons" => { prio => 15, inc => 0, ver => 1, rel => 1 }, + "${repotag}contribs" => { prio => 14, inc => 0, ver => 1, rel => 1 }, + "${repotag}test" => { prio => 13, inc => 0, ver => 2, rel => 3, devel => 2 }, + "${repotag}dev" => { prio => 12, 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 }, + 'rpmforge' => { prio => 7, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 }, + 'atrpms' => { prio => 6, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 }, + 'builds' => { prio => 4, inc => 0, ver => 0, rel => 0, orig => 1 }, + 'community' => { prio => 2, inc => 0, ver => 0, rel => 0, orig => 1 }, + 'stage' => { prio => 1, inc => 0, ver => 0, rel => 0, stage => 1, os => 1 }, + }; my $baserepo = { "~S${repotag}os/~A/" => "${repotag}os", - "~S${repotag}updates/~A/" => "${repotag}updates", - "~S${repotag}updates-testing/~A/" => "${repotag}updates-testing", - "~S${repotag}extras/~A/" => "${repotag}extras", - "~S${repotag}addons/~A/" => "${repotag}addons", - "~S${repotag}contribs/~A/" => "${repotag}contribs", - "~S${repotag}test/~A/" => "${repotag}test", - "~S${repotag}dev/~A/" => "${repotag}dev", - "/build/smeserver/stage/~s/~A/" => 'stage', - '/mirrors/centos/~C/fasttrack/~A/' => 'centos', - '/mirrors/centos/~C/updates/~A/' => 'centos', - '/mirrors/centos/~C/os/~A/' => 'centos', - '/mirrors/centos/~C/extras/~A/' => 'centos', - '/mirrors/centos-vault/~C/fasttrack/~A/' => 'centos', - '/mirrors/centos-vault/~C/updates/~A/' => 'centos', - '/mirrors/centos-vault/~C/os/~A/' => 'centos', - '/mirrors/centos-vault/~C/extras/~A/' => 'centos', - '/mirrors/fedora/epel/~C/~A/' => 'epel', - '/mirrors/fedora/epel/testing/~C/~A/' => 'epel', - '/mirrors/rpmforge/redhat/el~C/en/~A/dag/' => 'rpmforge', - '/mirrors/rpmforge/redhat/el~C/en/~A/extras/' => 'rpmforge', - '/mirrors/rpmforge/source/' => 'rpmforge', - '/mirrors/atrpms/el~C-~A/atrpms/stable/' => 'atrpms', - '/mirrors/atrpms/el~C-~A/atrpms/testing/' => 'atrpms', - '/mirrors/atrpms/src/el~C-~A/atrpms/stable/' => 'atrpms', - '/mirrors/atrpms/src/el~C-~A/atrpms/testing/' => 'atrpms', - }; - -my $skippkg = { '8' => { 'atrpms' => { map { $_ => 1 } ( 'clamav', 'gnupg' ) }, - 'centos' => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) }, - 'epel' => { map { $_ => 1 } ( 'clamav', 'fping', 'html2ps', 'horde', 'libtalloc', 'libtdb', 'oidentd', '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', 'smolt' ) }, - 'rpmforge' => { map { $_ => 1 } ( 'dovecot', 'libtalloc', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) }, - }, - '9' => { 'atrpms' => { map { $_ => 1 } ( 'clamav', 'perl-Pod-Escapes', 'perl-Pod-Simple' ) }, - 'epel' => { map { $_ => 1 } ( 'oidentd', 'perl-Razor-Agent' ) }, - 'rpmforge' => { map { $_ => 1 } ( 'perl-CGI', 'perl-Compress-Raw-Zlib', 'perl-ExtUtils-ParseXS', 'perl-Pod-Escapes', 'perl-Pod-Simple', 'perl-Time-HiRes', 'perl-version', 'spamassassin' ) }, - }, - }; + "~S${repotag}updates/~A/" => "${repotag}updates", + "~S${repotag}updates-testing/~A/" => "${repotag}updates-testing", + "~S${repotag}extras/~A/" => "${repotag}extras", + "~S${repotag}addons/~A/" => "${repotag}addons", + "~S${repotag}contribs/~A/" => "${repotag}contribs", + "~S${repotag}test/~A/" => "${repotag}test", + "~S${repotag}dev/~A/" => "${repotag}dev", + "/build/smeserver/stage/~s/~A/" => 'stage', + '/mirrors/centos/~C/fasttrack/~A/' => 'centos', + '/mirrors/centos/~C/updates/~A/' => 'centos', + '/mirrors/centos/~C/os/~A/' => 'centos', + '/mirrors/centos/~C/extras/~A/' => 'centos', + '/mirrors/centos-vault/~C/fasttrack/~A/' => 'centos', + '/mirrors/centos-vault/~C/updates/~A/' => 'centos', + '/mirrors/centos-vault/~C/os/~A/' => 'centos', + '/mirrors/centos-vault/~C/extras/~A/' => 'centos', + '/mirrors/fedora/epel/~C/~A/' => 'epel', + '/mirrors/fedora/epel/testing/~C/~A/' => 'epel', + '/mirrors/rpmforge/redhat/el~C/en/~A/dag/' => 'rpmforge', + '/mirrors/rpmforge/redhat/el~C/en/~A/extras/' => 'rpmforge', + '/mirrors/rpmforge/source/' => 'rpmforge', + '/mirrors/atrpms/el~C-~A/atrpms/stable/' => 'atrpms', + '/mirrors/atrpms/el~C-~A/atrpms/testing/' => 'atrpms', + '/mirrors/atrpms/src/el~C-~A/atrpms/stable/' => 'atrpms', + '/mirrors/atrpms/src/el~C-~A/atrpms/testing/' => 'atrpms', + }; + +my $skippkg = { '8' => { 'atrpms' => { map { $_ => 1 } ( 'clamav', 'gnupg' ) }, + 'centos' => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) }, + 'epel' => { map { $_ => 1 } ( 'clamav', 'fping', 'html2ps', 'horde', 'libtalloc', 'libtdb', 'oidentd', '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', 'smolt' ) }, + 'rpmforge' => { map { $_ => 1 } ( 'dovecot', 'libtalloc', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) }, + }, + '9' => { 'atrpms' => { map { $_ => 1 } ( 'clamav', 'perl-Pod-Escapes', 'perl-Pod-Simple' ) }, + 'epel' => { map { $_ => 1 } ( 'oidentd', 'perl-Razor-Agent' ) }, + 'rpmforge' => { map { $_ => 1 } ( 'perl-CGI', 'perl-Compress-Raw-Zlib', 'perl-ExtUtils-ParseXS', 'perl-Pod-Escapes', 'perl-Pod-Simple', 'perl-Time-HiRes', 'perl-version', 'spamassassin' ) }, + }, + '10' => { + }, + }; my ($stage) = sort { $repos->{$a}->{stage} <=> $repos->{$b}->{stage} } grep { $repos->{$_}->{stage} } keys %$repos; my ($devel1, $devel2) = sort { $repos->{$a}->{devel} <=> $repos->{$b}->{devel} } grep { $repos->{$_}->{devel} } keys %$repos; @@ -117,284 +130,284 @@ foreach my $ver ( sort { $a <=> $b } key %base = (); 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}/; - $bdir =~ s/~s/$ver/; - $bdir =~ s/~C/$distrepo->{$ver}->{centos}/; - for my $arch ( @archs, 'SRPMS/' ) { - my $adir = $bdir; - if ( $arch eq 'SRPMS/' ) { - $adir =~ s/~A.*//; - if ( -d "${adir}SRPMS" ) { - $adir .= "SRPMS/"; - } elsif ( -d "${adir}Source/SPackages" ) { - $adir .= "Source/SPackages/"; - } - } else { - $adir =~ s/~A/$arch/; - if ( -d "${adir}RPMS" ) { - $adir .= "RPMS/"; - } elsif ( -d "${adir}Packages" ) { - $adir .= "Packages/"; - } elsif ( -d "${adir}CentOS" ) { - $adir .= "CentOS/"; - } elsif ( -d "${adir}$osdir" ) { - $adir .= "$osdir/"; - } - } - next unless -d $adir; - opendir DIR, $adir or next; - process_rpm("$adir$_", $ver, $baserepo->{$dir}) foreach readdir DIR; - closedir DIR; - last unless $dir =~ m{~A}; - } + my $bdir = $dir; + $bdir =~ s/~S/$distrepo->{$ver}->{repo}/; + $bdir =~ s/~s/$ver/; + $bdir =~ s/~C/$distrepo->{$ver}->{centos}/; + for my $arch ( @{$distrepo->{$ver}->{'archs'}}, 'SRPMS/' ) { + my $adir = $bdir; + if ( $arch eq 'SRPMS/' ) { + $adir =~ s/~A.*//; + if ( -d "${adir}SRPMS" ) { + $adir .= "SRPMS/"; + } elsif ( -d "${adir}Source/SPackages" ) { + $adir .= "Source/SPackages/"; + } + } else { + $adir =~ s/~A/$arch/; + if ( -d "${adir}RPMS" ) { + $adir .= "RPMS/"; + } elsif ( -d "${adir}Packages" ) { + $adir .= "Packages/"; + } elsif ( -d "${adir}CentOS" ) { + $adir .= "CentOS/"; + } elsif ( -d "${adir}$osdir" ) { + $adir .= "$osdir/"; + } + } + next unless -d $adir; + opendir DIR, $adir or next; + process_rpm("$adir$_", $ver, $baserepo->{$dir}) foreach readdir DIR; + closedir DIR; + last unless $dir =~ m{~A}; + } } find( { wanted => sub { process_rpm($_, $ver, 'builds'); }, no_chdir => 1, follow_fast => 1 }, "$_" ) foreach @{$distrepo->{$ver}->{'builds'}}; find( { wanted => sub { process_rpm($_, $ver, 'community'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$ver}->{'community'} ) if $distrepo->{$ver}->{'community'}; foreach my $base ( sort keys %$rpms ) { - next unless $rpms->{$base}->{rpms}; - my %track = (); - my %seen = (); - my %counts = (); - my $acnt = (); - my $print = 0; - %latest = (); - - foreach my $pkg ( sort { $b->{rpm} cmp $a->{rpm} } @{$rpms->{$base}->{rpms}} ) { - next if $pkg->{done}; - - my $tmp = $pkg->{svr}; - # srpm transformations to match up binary and source rpms - SRC: { - # Try to find the name the binary wants (no changes) - $rpms->{$base}->{vers}->{$tmp} && last SRC; - - # rpmforge (.el4.rf to .rf, with rf,rfb,rft,rfx endings) - ($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf[btx]?)$}{$1} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - # rpmforge (.el4.rfx to .rf, rfb,rft,rfx switched to rf) - ($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)[btx]$}{$1} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - # rpmforge (.el4.rf to .rfx, rf,rfb,rft,rfx switched to rfx) - ($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)[btx]?$}{$1x} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - # rpmforge (.el4.rf to .el5) TODO: remove when no longer needed - ($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.el5} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - # rpmforge (.2.el4.rf to .rf, minor modification not pushed to source?) TODO: remove when no longer needed - ($tmp = $pkg->{svr}) =~ s{\.2\.el\d(\.rf)$}{$1} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - - # atrpms (remove .at) - ($tmp = $pkg->{svr}) =~ s{\.at$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - # atrpms (remove .el4.at) - ($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - # atrpms (remove .el4) - ($tmp = $pkg->{svr}) =~ s{\.el\d$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - # atrpms (remove .0.el5, minor modification not pushed to source?) TODO: remove when no longer needed - ($tmp = $pkg->{svr}) =~ s{\.0\.el\d$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - - # Transformations that we hopefully won't have to use anymore TODO: remove if no issues - #($tmp = $pkg->{svr}) =~ s{(\.el\d)\.rf$}{$1} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - #($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+(\.rf)$}{$1$2} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - #($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.dag} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - #($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d\.rf$}{$1.dag} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - #($tmp = $pkg->{svr}) =~ s{\.el\d_}{_} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - #($tmp = $pkg->{svr}) =~ s{(-\d+)\.\d+\.el\d$}{$1} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - #($tmp = $pkg->{svr}) =~ s{\.centos\d$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - #($tmp = $pkg->{svr}) =~ s{\.at$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; - #($tmp = $pkg->{svr}) =~ s{\.el\d\.$disttag$}{ && $rpms->{$base}->{vers}->{$tmp} && last SRC; - } - if ( $rpms->{$base}->{vers}->{$tmp} ) { - foreach $tmp ( @{$rpms->{$base}->{vers}->{$tmp}} ) { - $tmp->{svr} = $pkg->{svr}; - push @{$rpms->{$base}->{rpms}}, $tmp unless $tmp->{added}; - $tmp->{added}++; - } - } - - my %orig = (); - my %pkgs = (); - my %reposrc = (); - my $srpm = undef; - foreach my $cmp ( sort { $a->{src} <=> $b->{src} || $repos->{$b->{repo}}->{prio} <=> $repos->{$a->{repo}}->{prio} } @{$rpms->{$base}->{rpms}} ) { - next unless $cmp->{svr} eq $pkg->{svr}; - - if ( ! $track{repo} || $repos->{$cmp->{repo}}->{prio} > $repos->{$track{repo}}->{prio} ) { - if ( $cmp->{src} ) { - if ( ! $track{repo} ) { - $cmp->{delete}++; - $cmp->{done}++; - next; - } - } else { - $track{repo} = $cmp->{repo}; - $track{svr} = $cmp->{svr}; - } - } - if ( $cmp->{svr} eq $track{svr} ) { - if ( $seen{$cmp->{nvra}} ) { - if ( $track{repo} ne $cmp->{repo} ) { - if ($repos->{$cmp->{repo}}->{stage} ) { - if ( $seen{$cmp->{nvra}}->{latest} ) { - $seen{$cmp->{nvra}}->{latest}++; - delete $cmp->{delete} if $cmp->{delete}; - } else { - $cmp->{delete}++; - } - } elsif ( $repos->{$cmp->{repo}}->{orig} ) { - $orig{$cmp->{nvra}}++; - unless ( $repos->{$cmp->{repo}}->{base} ) { + next unless $rpms->{$base}->{rpms}; + my %track = (); + my %seen = (); + my %counts = (); + my $acnt = (); + my $print = 0; + %latest = (); + + foreach my $pkg ( sort { $b->{rpm} cmp $a->{rpm} } @{$rpms->{$base}->{rpms}} ) { + next if $pkg->{done}; + + my $tmp = $pkg->{svr}; + # srpm transformations to match up binary and source rpms + SRC: { + # Try to find the name the binary wants (no changes) + $rpms->{$base}->{vers}->{$tmp} && last SRC; + + # rpmforge (.el4.rf to .rf, with rf,rfb,rft,rfx endings) + ($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf[btx]?)$}{$1} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + # rpmforge (.el4.rfx to .rf, rfb,rft,rfx switched to rf) + ($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)[btx]$}{$1} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + # rpmforge (.el4.rf to .rfx, rf,rfb,rft,rfx switched to rfx) + ($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)[btx]?$}{$1x} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + # rpmforge (.el4.rf to .el5) TODO: remove when no longer needed + ($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.el5} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + # rpmforge (.2.el4.rf to .rf, minor modification not pushed to source?) TODO: remove when no longer needed + ($tmp = $pkg->{svr}) =~ s{\.2\.el\d(\.rf)$}{$1} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + + # atrpms (remove .at) + ($tmp = $pkg->{svr}) =~ s{\.at$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + # atrpms (remove .el4.at) + ($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + # atrpms (remove .el4) + ($tmp = $pkg->{svr}) =~ s{\.el\d$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + # atrpms (remove .0.el5, minor modification not pushed to source?) TODO: remove when no longer needed + ($tmp = $pkg->{svr}) =~ s{\.0\.el\d$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + + # Transformations that we hopefully won't have to use anymore TODO: remove if no issues + #($tmp = $pkg->{svr}) =~ s{(\.el\d)\.rf$}{$1} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + #($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+(\.rf)$}{$1$2} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + #($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.dag} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + #($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d\.rf$}{$1.dag} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + #($tmp = $pkg->{svr}) =~ s{\.el\d_}{_} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + #($tmp = $pkg->{svr}) =~ s{(-\d+)\.\d+\.el\d$}{$1} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + #($tmp = $pkg->{svr}) =~ s{\.centos\d$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + #($tmp = $pkg->{svr}) =~ s{\.at$}{} && $rpms->{$base}->{vers}->{$tmp} && last SRC; + #($tmp = $pkg->{svr}) =~ s{\.el\d\.$disttag$}{ && $rpms->{$base}->{vers}->{$tmp} && last SRC; + } + if ( $rpms->{$base}->{vers}->{$tmp} ) { + foreach $tmp ( @{$rpms->{$base}->{vers}->{$tmp}} ) { + $tmp->{svr} = $pkg->{svr}; + push @{$rpms->{$base}->{rpms}}, $tmp unless $tmp->{added}; + $tmp->{added}++; + } + } + + my %orig = (); + my %pkgs = (); + my %reposrc = (); + my $srpm = undef; + foreach my $cmp ( sort { $a->{src} <=> $b->{src} || $repos->{$b->{repo}}->{prio} <=> $repos->{$a->{repo}}->{prio} } @{$rpms->{$base}->{rpms}} ) { + next unless $cmp->{svr} eq $pkg->{svr}; + + if ( ! $track{repo} || $repos->{$cmp->{repo}}->{prio} > $repos->{$track{repo}}->{prio} ) { + if ( $cmp->{src} ) { + if ( ! $track{repo} ) { + $cmp->{delete}++; + $cmp->{done}++; + next; + } + } else { + $track{repo} = $cmp->{repo}; + $track{svr} = $cmp->{svr}; + } + } + if ( $cmp->{svr} eq $track{svr} ) { + if ( $seen{$cmp->{nvra}} ) { + if ( $track{repo} ne $cmp->{repo} ) { + if ($repos->{$cmp->{repo}}->{stage} ) { + if ( $seen{$cmp->{nvra}}->{latest} ) { + $seen{$cmp->{nvra}}->{latest}++; + delete $cmp->{delete} if $cmp->{delete}; + } else { + $cmp->{delete}++; + } + } elsif ( $repos->{$cmp->{repo}}->{orig} ) { + $orig{$cmp->{nvra}}++; + unless ( $repos->{$cmp->{repo}}->{base} ) { my $tag = dirname(dirname($cmp->{rpm}->{filename})); - qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED"; - } - } elsif ( $cmp->{src} ) { - if ( $cmp->{delete} && $cmp->{oldrepo} && $reposrc{$cmp->{oldrepo}}) { - $cmp->{repo} = $cmp->{oldrepo}; - delete $cmp->{delete}; - } - if ( $reposrc{$cmp->{repo}} ) { - $reposrc{$cmp->{repo}}->{srpm} = $cmp; - $srpm = $cmp if ! $srpm; - } elsif ( $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo} && ! $cmp->{done} ) { - $cmp->{delete}++; - } - } elsif ( $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo} ) { - $cmp->{delete}++; - } - } elsif ( $cmp->{src} ) { - if ( $reposrc{$cmp->{repo}} && $reposrc{$cmp->{repo}}->{srpm} && $reposrc{$cmp->{repo}}->{srpm}->{oldrepo} ne $cmp->{repo} ) { - $acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{src} = [ - grep { $_ ne $reposrc{$cmp->{repo}}->{srpm} } @{$acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{src}} - ]; - - if ( @{$reposrc{$cmp->{repo}}->{srpm}->{repos}} == 1 ) { - $reposrc{$cmp->{repo}}->{srpm}->{repo} = $reposrc{$cmp->{repo}}->{srpm}->{oldrepo}; - delete $reposrc{$cmp->{repo}}->{srpm}->{oldrepo}; - delete $reposrc{$cmp->{repo}}->{srpm}->{delete}; - delete $reposrc{$cmp->{repo}}->{srpm}->{repos}; - delete $reposrc{$cmp->{repo}}->{srpm}->{done}; - $seen{$cmp->{nvra}} = $cmp if $seen{$cmp->{nvra}} eq $reposrc{$cmp->{repo}}->{srpm}; - } else { - warn "How did I get here??"; - } - } else { - $seen{$cmp->{nvra}} = $cmp if $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo}; - } - $srpm = $cmp if ! $srpm && $cmp->{src}; - $reposrc{$cmp->{repo}}->{srpm} = $cmp if $reposrc{$cmp->{repo}}; - } - } elsif ( $repos->{$cmp->{repo}}->{stage} ) { - $cmp->{delete}++; - } else { - $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}); - $dest = $devel1 if verrel($cmp, $dest, \%counts); - if ( $cmp->{repo} ne $dest ) { - push @{$cmp->{repos}}, $dest; - if ( $repos->{$cmp->{repo}}->{orig} ) { - $orig{$cmp->{nvra}}++; - unless ( $repos->{$cmp->{repo}}->{base} ) { + qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED"; + } + } elsif ( $cmp->{src} ) { + if ( $cmp->{delete} && $cmp->{oldrepo} && $reposrc{$cmp->{oldrepo}}) { + $cmp->{repo} = $cmp->{oldrepo}; + delete $cmp->{delete}; + } + if ( $reposrc{$cmp->{repo}} ) { + $reposrc{$cmp->{repo}}->{srpm} = $cmp; + $srpm = $cmp if ! $srpm; + } elsif ( $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo} && ! $cmp->{done} ) { + $cmp->{delete}++; + } + } elsif ( $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo} ) { + $cmp->{delete}++; + } + } elsif ( $cmp->{src} ) { + if ( $reposrc{$cmp->{repo}} && $reposrc{$cmp->{repo}}->{srpm} && $reposrc{$cmp->{repo}}->{srpm}->{oldrepo} ne $cmp->{repo} ) { + $acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{src} = [ + grep { $_ ne $reposrc{$cmp->{repo}}->{srpm} } @{$acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{src}} + ]; + + if ( @{$reposrc{$cmp->{repo}}->{srpm}->{repos}} == 1 ) { + $reposrc{$cmp->{repo}}->{srpm}->{repo} = $reposrc{$cmp->{repo}}->{srpm}->{oldrepo}; + delete $reposrc{$cmp->{repo}}->{srpm}->{oldrepo}; + delete $reposrc{$cmp->{repo}}->{srpm}->{delete}; + delete $reposrc{$cmp->{repo}}->{srpm}->{repos}; + delete $reposrc{$cmp->{repo}}->{srpm}->{done}; + $seen{$cmp->{nvra}} = $cmp if $seen{$cmp->{nvra}} eq $reposrc{$cmp->{repo}}->{srpm}; + } else { + warn "How did I get here??"; + } + } else { + $seen{$cmp->{nvra}} = $cmp if $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo}; + } + $srpm = $cmp if ! $srpm && $cmp->{src}; + $reposrc{$cmp->{repo}}->{srpm} = $cmp if $reposrc{$cmp->{repo}}; + } + } elsif ( $repos->{$cmp->{repo}}->{stage} ) { + $cmp->{delete}++; + } else { + $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}); + $dest = $devel1 if verrel($cmp, $dest, \%counts); + if ( $cmp->{repo} ne $dest ) { + push @{$cmp->{repos}}, $dest; + if ( $repos->{$cmp->{repo}}->{orig} ) { + $orig{$cmp->{nvra}}++; + unless ( $repos->{$cmp->{repo}}->{base} ) { my $tag = dirname(dirname($cmp->{rpm}->{filename})); - qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED"; - } - } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) { - $reposrc{$cmp->{repo}}->{srpm} = $cmp; - } else { - $cmp->{delete}++; - } - $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo}; - $cmp->{repo} = $dest; - if ( ! $cmp->{src} && $repos->{$dest}->{prio} > $repos->{$track{repo}}->{prio} ) { - $track{repo} = $dest; - $track{svr} = $cmp->{svr}; - } - } - if ( $cmp->{src} && $reposrc{$cmp->{repo}} ) { - $reposrc{$cmp->{repo}}->{srpm} = $cmp; - } - } - } else { - if ( $track{repo} eq $cmp->{repo} ) { - if ( verrel($cmp, $cmp->{repo}, \%counts) ) { - $cmp->{delete}++ unless $repos->{$cmp->{repo}}->{base}; - } elsif ( $cmp->{src} ) { - $cmp->{delete}++ unless $repos->{$cmp->{repo}}->{base}; - } else { - $track{svr} = $cmp->{svr}; - } - } elsif ( ! $repos->{$cmp->{repo}}->{base} ) { - if ( $repos->{$cmp->{repo}}->{orig} ) { - $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}); - $dest = $devel1 if verrel($cmp, $dest, \%counts); - unless ( $cmp->{src} && ! $reposrc{$dest} ) { - if ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! verrel($cmp, $dest, \%counts) ) { - unless ( $repos->{$cmp->{repo}}->{base} ) { + qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED"; + } + } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) { + $reposrc{$cmp->{repo}}->{srpm} = $cmp; + } else { + $cmp->{delete}++; + } + $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo}; + $cmp->{repo} = $dest; + if ( ! $cmp->{src} && $repos->{$dest}->{prio} > $repos->{$track{repo}}->{prio} ) { + $track{repo} = $dest; + $track{svr} = $cmp->{svr}; + } + } + if ( $cmp->{src} && $reposrc{$cmp->{repo}} ) { + $reposrc{$cmp->{repo}}->{srpm} = $cmp; + } + } + } else { + if ( $track{repo} eq $cmp->{repo} ) { + if ( verrel($cmp, $cmp->{repo}, \%counts) ) { + $cmp->{delete}++ unless $repos->{$cmp->{repo}}->{base}; + } elsif ( $cmp->{src} ) { + $cmp->{delete}++ unless $repos->{$cmp->{repo}}->{base}; + } else { + $track{svr} = $cmp->{svr}; + } + } elsif ( ! $repos->{$cmp->{repo}}->{base} ) { + if ( $repos->{$cmp->{repo}}->{orig} ) { + $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}); + $dest = $devel1 if verrel($cmp, $dest, \%counts); + unless ( $cmp->{src} && ! $reposrc{$dest} ) { + if ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! verrel($cmp, $dest, \%counts) ) { + unless ( $repos->{$cmp->{repo}}->{base} ) { my $tag = dirname(dirname($cmp->{rpm}->{filename})); - qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED"; - } - push @{$cmp->{repos}}, $dest; - $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo}; - $cmp->{repo} = $dest; - $reposrc{$cmp->{repo}}->{srpm} = $cmp if $cmp->{src}; - $orig{$cmp->{nvra}}++; - } - } - } else { - $cmp->{delete}++; - } - } - } - unless ( $repos->{$cmp->{repo}}->{orig} || ( $cmp->{delete} && ! $cmp->{repos} ) ) { - $pkgs{$cmp->{nvra}}++; - $latest{$cmp->{base}} = $cmp->{svr} if $repos->{$cmp->{repo}}->{inc} && ! $latest{$cmp->{base}}; - $reposrc{$cmp->{repo}} = $cmp unless $reposrc{$cmp->{repo}} || $cmp->{src} || $repos->{$cmp->{repo}}->{stage}; - if ( $latest{$cmp->{base}} && $cmp->{svr} eq $latest{$cmp->{base}} && $repos->{$cmp->{repo}}->{inc} ) { - $cmp->{latest}++ if ! $seen{$cmp->{nvra}} || $cmp->{src}; - } - $seen{$cmp->{nvra}} = $cmp unless $seen{$cmp->{nvra}}; - push @{$acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{$cmp->{src} ? 'src' : $cmp->{rpm}->arch}}, $cmp unless $cmp->{done}; - } - $cmp->{done}++; - } - if ( $srpm ) { - foreach my $r ( sort { $repos->{$b}->{prio} <=> $repos->{$a}->{prio} } keys %reposrc ) { - unless ( $reposrc{$r}->{srpm} ) { - unshift @{$srpm->{repos}}, $r; - $srpm->{oldrepo} = $srpm->{repo} unless $srpm->{oldrepo}; - $srpm->{repo} = $r; - $reposrc{$r}->{srpm} = $srpm; - } - } - } elsif ( scalar keys %pkgs && $opts{s} ) { - print "\n * missing source ($disttag$ver, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n"; - } - print "\n * missing originals ($disttag$ver, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n" if $opts{o} && scalar keys %orig != scalar keys %pkgs; - } - - foreach my $r ( keys %$acnt ) { - foreach my $p ( keys %{$acnt->{$r}} ) { - foreach my $a ( keys %{$acnt->{$r}->{$p}} ) { - if ( $a eq 'noarch' ) { - my $p2 = ${$acnt->{$r}->{$p}->{$a}}[0]; - if ( ! $p2->{repos} && scalar @{$acnt->{$r}->{$p}->{$a}} != scalar @archs ) { - $p2->{oldrepo} = $p2->{repo}; - push @{$p2->{repos}}, $p2->{repo}; - } - } elsif ( scalar @{$acnt->{$r}->{$p}->{$a}} != 1 ) { - print "\n * many packages ($r, $a, $p)\n" unless $p =~ m{^syslinux-nonlinux-[0-9]}; - } - } - } - } - - foreach my $pkg ( sort { $a->{nvra} cmp $b->{nvra} } @{$rpms->{$base}->{rpms}} ) { - if ( $pkg->{latest} && $pkg->{latest} == 1 ) { - unless ( grep { $_->{nvra} eq $pkg->{nvra} && $_->{repo} eq $stage } @{$rpms->{$base}->{rpms}} ) { - $pkg->{oldrepo} = $pkg->{repo} unless $pkg->{oldrepo}; - $pkg->{repo} = $stage; - push @{$pkg->{repos}}, $stage; - } - } + qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED"; + } + push @{$cmp->{repos}}, $dest; + $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo}; + $cmp->{repo} = $dest; + $reposrc{$cmp->{repo}}->{srpm} = $cmp if $cmp->{src}; + $orig{$cmp->{nvra}}++; + } + } + } else { + $cmp->{delete}++; + } + } + } + unless ( $repos->{$cmp->{repo}}->{orig} || ( $cmp->{delete} && ! $cmp->{repos} ) ) { + $pkgs{$cmp->{nvra}}++; + $latest{$cmp->{base}} = $cmp->{svr} if $repos->{$cmp->{repo}}->{inc} && ! $latest{$cmp->{base}}; + $reposrc{$cmp->{repo}} = $cmp unless $reposrc{$cmp->{repo}} || $cmp->{src} || $repos->{$cmp->{repo}}->{stage}; + if ( $latest{$cmp->{base}} && $cmp->{svr} eq $latest{$cmp->{base}} && $repos->{$cmp->{repo}}->{inc} ) { + $cmp->{latest}++ if ! $seen{$cmp->{nvra}} || $cmp->{src}; + } + $seen{$cmp->{nvra}} = $cmp unless $seen{$cmp->{nvra}}; + push @{$acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{$cmp->{src} ? 'src' : $cmp->{rpm}->arch}}, $cmp unless $cmp->{done}; + } + $cmp->{done}++; + } + if ( $srpm ) { + foreach my $r ( sort { $repos->{$b}->{prio} <=> $repos->{$a}->{prio} } keys %reposrc ) { + unless ( $reposrc{$r}->{srpm} ) { + unshift @{$srpm->{repos}}, $r; + $srpm->{oldrepo} = $srpm->{repo} unless $srpm->{oldrepo}; + $srpm->{repo} = $r; + $reposrc{$r}->{srpm} = $srpm; + } + } + } elsif ( scalar keys %pkgs && $opts{s} ) { + print "\n * missing source ($disttag$ver, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n"; + } + print "\n * missing originals ($disttag$ver, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n" if $opts{o} && scalar keys %orig != scalar keys %pkgs; + } + + foreach my $r ( keys %$acnt ) { + foreach my $p ( keys %{$acnt->{$r}} ) { + foreach my $a ( keys %{$acnt->{$r}->{$p}} ) { + if ( $a eq 'noarch' ) { + my $p2 = ${$acnt->{$r}->{$p}->{$a}}[0]; + if ( ! $p2->{repos} && scalar @{$acnt->{$r}->{$p}->{$a}} != scalar @{$distrepo->{$ver}->{'archs'}} ) { + $p2->{oldrepo} = $p2->{repo}; + push @{$p2->{repos}}, $p2->{repo}; + } + } elsif ( scalar @{$acnt->{$r}->{$p}->{$a}} != 1 ) { + print "\n * many packages ($r, $a, $p)\n" unless $p =~ m{^syslinux-nonlinux-[0-9]}; + } + } + } + } + + foreach my $pkg ( sort { $a->{nvra} cmp $b->{nvra} } @{$rpms->{$base}->{rpms}} ) { + if ( $pkg->{latest} && $pkg->{latest} == 1 ) { + unless ( grep { $_->{nvra} eq $pkg->{nvra} && $_->{repo} eq $stage } @{$rpms->{$base}->{rpms}} ) { + $pkg->{oldrepo} = $pkg->{repo} unless $pkg->{oldrepo}; + $pkg->{repo} = $stage; + push @{$pkg->{repos}}, $stage; + } + } if ( ! $print && ($pkg->{delete} || $pkg->{repos} || ( ! $repos->{$pkg->{repo}}->{base} && $pkg->{nosig} && $distrepo->{$ver}->{sign} ) ) ) { print "\n$base ($disttag$ver)\n", "=" x length("$base ($disttag$ver)"), "\n"; @@ -413,81 +426,81 @@ foreach my $ver ( sort { $a <=> $b } key } } - if ( $pkg->{repos} ) { - foreach my $repo ( @{$pkg->{repos}} ) { - if ( $pkg->{delete} ) { - print "move from ", $pkg->{oldrepo}, " to $repo (", basename($pkg->{rpm}->filename), ")\n"; - $pkg->{delete} = 0; - $repochg{$pkg->{oldrepo}}++ unless $repos->{$pkg->{oldrepo}}->{base} || $repos->{$pkg->{oldrepo}}->{stage}; - } elsif ( $pkg->{oldrepo} eq $repo ) { - print "distribute noarch in $repo (", basename($pkg->{rpm}->filename), ")\n"; - } else { - print "copy from ", $pkg->{oldrepo}, " to $repo (", basename($pkg->{rpm}->filename), ")\n"; - } - $repochg{$repo}++ unless $repos->{$repo}->{base} || $repos->{$repo}->{stage}; - $pkg->{oldrepo} = $repo unless $pkg->{oldrepo} eq ${$pkg->{repos}}[0]; - - my @d = (); - my $head = $distrepo->{$ver}->{repo} . $repo . '/'; - $head = $distrepo->{$ver}->{stage} if $repos->{$repo}->{stage}; - my $tail = $repos->{$repo}->{os} ? "$osdir/" : 'RPMS/'; - if ( $pkg->{src} ) { - push @d, "${head}SRPMS/" . basename($pkg->{rpm}->filename); - } elsif ( $pkg->{rpm}->arch eq 'noarch' ) { - push @d, map { "${head}$_/$tail" . basename($pkg->{rpm}->filename) } @archs; - } elsif ( $pkg->{rpm}->arch =~ m{^(i[356]86)$} ) { - push @d, "${head}i386/$tail" . basename($pkg->{rpm}->filename); - } else { - push @d, $head . $pkg->{rpm}->arch . "/$tail" . basename($pkg->{rpm}->filename); - } - foreach my $dest ( @d ) { - qx(cp --preserve=timestamps $src $dest) unless $opts{t} || -f "$dest"; - } - - } - qx(rm -f $src) if exists $pkg->{delete} && ! $opts{t}; - } elsif ( $pkg->{delete} ) { - print "delete from ", $pkg->{repo}, " (", $pkg->{arch}, ", ", basename($pkg->{rpm}->filename), ")\n"; - qx(rm -f $src) unless $opts{t}; - $repochg{$pkg->{repo}}++ unless $repos->{$pkg->{repo}}->{base} || $repos->{$pkg->{repo}}->{stage}; - if ( $repos->{$pkg->{repo}}->{orig} && ! $repos->{$pkg->{repo}}->{base} ) { + if ( $pkg->{repos} ) { + foreach my $repo ( @{$pkg->{repos}} ) { + if ( $pkg->{delete} ) { + print "move from ", $pkg->{oldrepo}, " to $repo (", basename($pkg->{rpm}->filename), ")\n"; + $pkg->{delete} = 0; + $repochg{$pkg->{oldrepo}}++ unless $repos->{$pkg->{oldrepo}}->{base} || $repos->{$pkg->{oldrepo}}->{stage}; + } elsif ( $pkg->{oldrepo} eq $repo ) { + print "distribute noarch in $repo (", basename($pkg->{rpm}->filename), ")\n"; + } else { + print "copy from ", $pkg->{oldrepo}, " to $repo (", basename($pkg->{rpm}->filename), ")\n"; + } + $repochg{$repo}++ unless $repos->{$repo}->{base} || $repos->{$repo}->{stage}; + $pkg->{oldrepo} = $repo unless $pkg->{oldrepo} eq ${$pkg->{repos}}[0]; + + my @d = (); + my $head = $distrepo->{$ver}->{repo} . $repo . '/'; + $head = $distrepo->{$ver}->{stage} if $repos->{$repo}->{stage}; + my $tail = $repos->{$repo}->{os} ? "$osdir/" : 'RPMS/'; + if ( $pkg->{src} ) { + 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 ( $pkg->{rpm}->arch =~ m{^(i[356]86)$} ) { + push @d, "${head}i386/$tail" . basename($pkg->{rpm}->filename); + } else { + push @d, $head . $pkg->{rpm}->arch . "/$tail" . basename($pkg->{rpm}->filename); + } + foreach my $dest ( @d ) { + qx(cp --preserve=timestamps $src $dest) unless $opts{t} || -f "$dest"; + } + + } + qx(rm -f $src) if exists $pkg->{delete} && ! $opts{t}; + } elsif ( $pkg->{delete} ) { + print "delete from ", $pkg->{repo}, " (", $pkg->{arch}, ", ", basename($pkg->{rpm}->filename), ")\n"; + qx(rm -f $src) unless $opts{t}; + $repochg{$pkg->{repo}}++ unless $repos->{$pkg->{repo}}->{base} || $repos->{$pkg->{repo}}->{stage}; + if ( $repos->{$pkg->{repo}}->{orig} && ! $repos->{$pkg->{repo}}->{base} ) { my $tag = dirname(dirname($pkg->{rpm}->{filename})); - qx(rm -f $tag/PUSHED) if ! $opts{t} && -d $tag && -f "$tag/PUSHED"; - } - } - } - - if ( $rpms->{$base}->{srpms} ) { - foreach my $pkg ( sort { $b->{rpm} cmp $a->{rpm} } @{$rpms->{$base}->{srpms}} ) { - next if $pkg->{done} || $repos->{$pkg->{repo}}->{orig} || $repos->{$pkg->{repo}}->{base}; - $pkg->{delete}++; - my $src = $pkg->{rpm}->filename; - if ( ! $print && ($pkg->{delete} || $pkg->{repos} || ( $pkg->{nosig} && $distrepo->{$ver}->{sign} ) ) ) { - print "\n$base ($disttag$ver)\n", "=" x length("$base ($disttag$ver)"), "\n"; - $print++; - } - print "delete from ", $pkg->{repo}, " (", $pkg->{arch}, ", ", basename($pkg->{rpm}->filename), ")\n"; - qx(rm -f $src) unless $opts{t}; - $repochg{$pkg->{repo}}++ unless $repos->{$pkg->{repo}}->{base} || $repos->{$pkg->{repo}}->{stage}; - } - } + qx(rm -f $tag/PUSHED) if ! $opts{t} && -d $tag && -f "$tag/PUSHED"; + } + } + } + + if ( $rpms->{$base}->{srpms} ) { + foreach my $pkg ( sort { $b->{rpm} cmp $a->{rpm} } @{$rpms->{$base}->{srpms}} ) { + next if $pkg->{done} || $repos->{$pkg->{repo}}->{orig} || $repos->{$pkg->{repo}}->{base}; + $pkg->{delete}++; + my $src = $pkg->{rpm}->filename; + if ( ! $print && ($pkg->{delete} || $pkg->{repos} || ( $pkg->{nosig} && $distrepo->{$ver}->{sign} ) ) ) { + print "\n$base ($disttag$ver)\n", "=" x length("$base ($disttag$ver)"), "\n"; + $print++; + } + print "delete from ", $pkg->{repo}, " (", $pkg->{arch}, ", ", basename($pkg->{rpm}->filename), ")\n"; + qx(rm -f $src) unless $opts{t}; + $repochg{$pkg->{repo}}++ unless $repos->{$pkg->{repo}}->{base} || $repos->{$pkg->{repo}}->{stage}; + } + } } if ( %repochg ) { - print "\nrebuild repo ($disttag$ver)\n", "=" x length("rebuild repo ($disttag$ver)"), "\n"; + print "\nrebuild repo ($disttag$ver)\n", "=" x length("rebuild repo ($disttag$ver)"), "\n"; } foreach my $repo ( sort { $repos->{$b}->{prio} <=> $repos->{$a}->{prio} } keys %repochg ) { - next if $repos->{$repo}->{orig} || $repos->{$repo}->{stage}; - foreach my $arch ( @archs ) { - my $dir = $distrepo->{$ver}->{repo} . "$repo/$arch"; - $dir = qx(readlink -f $dir); - if ( $dir ) { - chomp $dir; - } else { - $dir = $distrepo->{$ver}->{repo} . "$repo/$arch"; - } - print "rebuild $repo/$arch\n"; - unless ( $opts{t} ) { + next if $repos->{$repo}->{orig} || $repos->{$repo}->{stage}; + foreach my $arch ( @{$distrepo->{$ver}->{'archs'}} ) { + my $dir = $distrepo->{$ver}->{repo} . "$repo/$arch"; + $dir = qx(readlink -f $dir); + if ( $dir ) { + chomp $dir; + } else { + $dir = $distrepo->{$ver}->{repo} . "$repo/$arch"; + } + print "rebuild $repo/$arch\n"; + unless ( $opts{t} ) { my $checksum = "--checksum $distrepo->{$ver}->{checksum}"; my $exclude = ""; @@ -498,22 +511,22 @@ foreach my $ver ( sort { $a <=> $b } key $groupfile = "--simple-md-filenames --groupfile repodata/comps.xml" if -f "$dir/repodata/comps.xml"; qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm $checksum $exclude $groupfile $dir); - qx(repoview $dir); + qx(repoview $dir); - qx(rm -rf $dir/.olddata) if -d "$dir/.olddata"; - qx(rm -rf $dir/.repodata) if -d "$dir/.repodata"; - qx(rm -rf $dir/repodata/index.html) if -f "$dir/repodata/index.html"; - qx(rm -rf $dir/repodata/update-info) if -d "$dir/repodata/update-info"; - qx(rm -rf $dir/repodata/repoview) if -d "$dir/repodata/repoview"; - } - } + qx(rm -rf $dir/.olddata) if -d "$dir/.olddata"; + qx(rm -rf $dir/.repodata) if -d "$dir/.repodata"; + qx(rm -rf $dir/repodata/index.html) if -f "$dir/repodata/index.html"; + qx(rm -rf $dir/repodata/update-info) if -d "$dir/repodata/update-info"; + qx(rm -rf $dir/repodata/repoview) if -d "$dir/repodata/repoview"; + } + } } unless ( $opts{t} ) { 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}"; } } @@ -536,14 +549,14 @@ sub pkgdest { my $pkgs = shift; foreach my $cmp ( @$pkgs ) { - next if $cmp->{src} || $repos->{$cmp->{repo}}->{prio} <= $repos->{$dest}->{prio}; - next if $pkg->{name} ne ( $pkg->{src} ? $cmp->{base} : $cmp->{name} ); - if ( $repos->{$cmp->{repo}}->{prio} > $repos->{$hirepo}->{prio} ) { - $dest = $hirepo; - last; - } else { - $dest = $cmp->{repo}; - } + next if $cmp->{src} || $repos->{$cmp->{repo}}->{prio} <= $repos->{$dest}->{prio}; + next if $pkg->{name} ne ( $pkg->{src} ? $cmp->{base} : $cmp->{name} ); + if ( $repos->{$cmp->{repo}}->{prio} > $repos->{$hirepo}->{prio} ) { + $dest = $hirepo; + last; + } else { + $dest = $cmp->{repo}; + } } return $dest; } @@ -570,8 +583,8 @@ sub process_rpm { my $cmp = $latest{$pkg->name}; if ( $repos->{$repo}->{base} && ! $pkg->is_source_package ) { - return unless $cmp; - return if $repos->{$cmp->{repo}}->{base} && $repos->{$cmp->{repo}}->{prio} > $repos->{$repo}->{prio} && $pkg ge $cmp->{rpm}; + return unless $cmp; + return if $repos->{$cmp->{repo}}->{base} && $repos->{$cmp->{repo}}->{prio} > $repos->{$repo}->{prio} && $pkg ge $cmp->{rpm}; } my ($src, $version, $release) = ($pkg->is_source_package ? $pkg->filename : $pkg->sourcerpm) =~ m{(?:^|/)([^/]*)-([^-]+)-([^-]+)\.\w+\.rpm$}; return if $skippkg->{$ver}->{$repo} && ( $skippkg->{$ver}->{$repo}->{$src} || $skippkg->{$ver}->{$repo}->{$pkg->name} ); @@ -584,31 +597,31 @@ sub process_rpm { $arch = 'noarch' if $pkg->filename =~ m{[/-]noarch/}; my $rpmhash = { base => $src, - name => $pkg->name, - repo => $repo, - nvra => $pkg->name.'-'.$pkg->version.'-'.$pkg->release.'.'.( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ), - svr => $src.'-'.$version.'-'.$release, - src => $pkg->is_source_package, - arch => $arch, - ver => $version, - rel => $release, - rpm => $pkg, - nosig => $nosig, - }; + name => $pkg->name, + repo => $repo, + nvra => $pkg->name.'-'.$pkg->version.'-'.$pkg->release.'.'.( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ), + svr => $src.'-'.$version.'-'.$release, + src => $pkg->is_source_package, + arch => $arch, + ver => $version, + rel => $release, + rpm => $pkg, + nosig => $nosig, + }; if ( $pkg->is_source_package ) { - push @{$rpms->{$src}->{srpms}}, $rpmhash; - push @{$rpms->{$src}->{vers}->{$rpmhash->{svr}}}, $rpmhash; + push @{$rpms->{$src}->{srpms}}, $rpmhash; + push @{$rpms->{$src}->{vers}->{$rpmhash->{svr}}}, $rpmhash; } else { - push @{$rpms->{$src}->{rpms}}, $rpmhash; + push @{$rpms->{$src}->{rpms}}, $rpmhash; } $sources{$src}++; return if $pkg->is_source_package || $repos->{$repo}->{stage}; if ( ! $repos->{$repo}->{base} ) { - if ( ! $cmp || $pkg gt $cmp->{rpm} ) { - $latest{$pkg->name} = $rpmhash; - } + if ( ! $cmp || $pkg gt $cmp->{rpm} ) { + $latest{$pkg->name} = $rpmhash; + } } elsif ( ( $repos->{$repo}->{prio} >= $repos->{$cmp->{repo}}->{prio} || ! $repos->{$cmp->{repo}}->{base} ) && $pkg ge $cmp->{rpm} ) { - $latest{$pkg->name} = $rpmhash; + $latest{$pkg->name} = $rpmhash; } }