--- builds_bin/update_repos 2007/05/12 16:43:49 1.8 +++ builds_bin/update_repos 2007/05/19 21:55:09 1.9 @@ -11,11 +11,12 @@ my $releases = 2; my $releasedir = '/releases'; my $smerel = '7'; -my $arch = 'i386'; my $centosrel = '4'; my $fedorarel = '3'; my $builds = '/builds/rpms'; my $stagedir = '/builds'; +my $arch = `uname -i`; +chomp $arch; my @repos = ( "$releasedir/$smerel/smeos/$arch/CentOS/RPMS", @@ -184,18 +185,16 @@ foreach my $repo ( sort keys %srcrepohas foreach my $pkg ( sort grep { $repohash{$_}{$repo} } keys %repohash ) { my @rpms = ref($repohash{$pkg}{$repo}) eq "ARRAY" ? @{$repohash{$pkg}{$repo}} : ($repohash{$pkg}{$repo}); foreach my $rpm ( sort @rpms ) { - my $src = $rpm->tag("SOURCERPM"); + my $src; my @sources = (); - push @sources, $src; - push @sources, $src if ($src =~ s/\.\d+\.el\d+\.rf\./\.rf\./); - push @sources, $src if ($src =~ s/\.el\d\.rf\./\.rf\./); - push @sources, $src if ($src =~ s/\.el\d\.at\./\.at\./); - push @sources, $src if ($src =~ s/\.fc\d\.at\./\.at\./); - push @sources, $src if ($src =~ s/\.rf\./\.dag\./); - push @sources, $src if ($src =~ s/\.0\.el\d+\./\.at\./); - push @sources, $src if ($src =~ s/\.el\d+\./\.at\./); - + push @sources, ($src = $rpm->tag("SOURCERPM")); + push @sources, $src if (($src = $rpm->tag("SOURCERPM")) =~ s/\.el\d\.rf\./\.rf\./); + push @sources, $src if (($src = $rpm->tag("SOURCERPM")) =~ s/\.[0-3]\.el\d+\.rf\./\.rf\./); + push @sources, $src if (($src = $rpm->tag("SOURCERPM")) =~ s/\.(el|fc)\d\.at//); + push @sources, $src if (($src = $rpm->tag("SOURCERPM")) =~ s/\.at//); + push @sources, $src if (($src = $rpm->tag("SOURCERPM")) =~ s/\.(el|fc)\d//); + $src = $rpm->tag("SOURCERPM"); my $found = 0; foreach my $source ( @sources ) {