/[smeserver]/builds_bin/update_repos
ViewVC logotype

Diff of /builds_bin/update_repos

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.77 by slords, Fri Oct 10 15:46:43 2014 UTC Revision 1.79 by unnilennium, Sat Mar 5 15:57:15 2016 UTC
# Line 129  foreach my $ver ( sort { $a <=> $b } key Line 129  foreach my $ver ( sort { $a <=> $b } key
129      %sources = ();      %sources = ();
130      %base = ();      %base = ();
131    
132        @{$distrepo->{$ver}->{all_archs}} = ('noarch', @{$distrepo->{$ver}->{'archs'}});
133        if ( grep $_ eq 'i386', @{$distrepo->{$ver}->{'archs'}} ) {
134            push @{$distrepo->{$ver}->{all_archs}}, ('i586', 'i686');
135        }
136    
137      foreach my $dir  ( sort { $repos->{$baserepo->{$b}}->{prio} <=> $repos->{$baserepo->{$a}}->{prio} || $a cmp $b } keys %$baserepo ) {      foreach my $dir  ( sort { $repos->{$baserepo->{$b}}->{prio} <=> $repos->{$baserepo->{$a}}->{prio} || $a cmp $b } keys %$baserepo ) {
138          my $bdir = $dir;          my $bdir = $dir;
139          $bdir =~ s/~S/$distrepo->{$ver}->{repo}/;          $bdir =~ s/~S/$distrepo->{$ver}->{repo}/;
# Line 295  foreach my $ver ( sort { $a <=> $b } key Line 300  foreach my $ver ( sort { $a <=> $b } key
300                          }                          }
301                      } elsif ( $repos->{$cmp->{repo}}->{stage} ) {                      } elsif ( $repos->{$cmp->{repo}}->{stage} ) {
302                          $cmp->{delete}++;                          $cmp->{delete}++;
303                      } elsif ( $cmp->{src} || ( $cmp->{rpm}->arch =~ m{^(i[356]86)$} && grep $_ eq 'i386', @{$distrepo->{$ver}->{'archs'}} ) ||                      } elsif ( $cmp->{src} || grep $_ eq $cmp->{rpm}->arch, @{$distrepo->{$ver}->{all_archs}} ) {
                               grep $_ eq $cmp->{rpm}->arch, @{$distrepo->{$ver}->{'archs'}} ) {  
304                          $srpm = $cmp if ! $srpm && $cmp->{src};                          $srpm = $cmp if ! $srpm && $cmp->{src};
305                          my $dest = $repos->{$track{repo}}->{prio} > $repos->{$devel2}->{prio} ? $track{repo} : $devel2;                          my $dest = $repos->{$track{repo}}->{prio} > $repos->{$devel2}->{prio} ? $track{repo} : $devel2;
306                          $dest = pkgdest($cmp, $devel1, $dest, $rpms->{$base}->{rpms});                          $dest = pkgdest($cmp, $devel1, $dest, $rpms->{$base}->{rpms});
# Line 523  foreach my $ver ( sort { $a <=> $b } key Line 527  foreach my $ver ( sort { $a <=> $b } key
527          }          }
528      }      }
529      unless ( $opts{t} ) {      unless ( $opts{t} ) {
530          foreach (@{$distrepo->{$ver}->{builds}})          foreach (@{$distrepo->{$ver}->{'builds'}})
531          {          {
532              finddepth(sub{rmdir}, "$_") if -d "$_";              finddepth(sub{rmdir}, "$_") if -d "$_";
533          }          }
534          finddepth(sub{rmdir}, $distrepo->{$ver}->{community}) if -d "$distrepo->{$ver}->{community}";          finddepth(sub{rmdir}, $distrepo->{$ver}->{'community'}) if -d "$distrepo->{$ver}->{'community'}";
535      }      }
536  }  }
537    

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed