aboutsummaryrefslogtreecommitdiffstats
path: root/emi
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2006-10-11 05:47:00 +0000
committerFlorent Villard <warly@mandriva.com>2006-10-11 05:47:00 +0000
commit8230409ff4881836dd415edf6f375b6b229999e0 (patch)
tree1783e74edb2754f083ac9c0a1aaa881446ce6fc2 /emi
parentde7ff78b325acc383bbdc43a4a2d0c0ad61cf105 (diff)
downloadiurt-8230409ff4881836dd415edf6f375b6b229999e0.tar
iurt-8230409ff4881836dd415edf6f375b6b229999e0.tar.gz
iurt-8230409ff4881836dd415edf6f375b6b229999e0.tar.bz2
iurt-8230409ff4881836dd415edf6f375b6b229999e0.tar.xz
iurt-8230409ff4881836dd415edf6f375b6b229999e0.zip
consider excluded arch; remove srpms after succesful build for i586 and x86_64
Diffstat (limited to 'emi')
-rwxr-xr-xemi12
1 files changed, 11 insertions, 1 deletions
diff --git a/emi b/emi
index 424262b..207f471 100755
--- a/emi
+++ b/emi
@@ -88,10 +88,12 @@ my ($fulldate, $daydate) = get_date();
$run{daydate} = $daydate;
print {$run{LOG}} "$program_name\n";
+my $todo = "$config->{queue}/todo/";
my $done = "$config->{queue}/done/";
my $reject = "$config->{queue}/rejected/";
my %pkg_tree;
+my %excluded;
check_upload_tree(\%run, $done,
sub {
my ($todo, $f, $m, $s, $r) = @_;
@@ -107,7 +109,12 @@ check_upload_tree(\%run, $done,
} elsif ($r =~ /(\d{14}\.\w+\.\w+\.\d+)_(.*)\.done$/) {
my ($prefix, $arch) = ($1, $2);
$cache->{arch}{$prefix}{$arch} = 1
+ } elsif ($r =~ /(\d{14}\.\w+\.\w+\.\d+)_(.*)\.excluded$/) {
+ my ($prefix, $arch) = ($1, $2);
+ $cache->{arch}{$prefix}{$arch} = 1;
+ $excluded{$prefix}{$arch} = 1
}
+
},
);
@@ -119,6 +126,7 @@ foreach my $prefix (keys %pkg_tree) {
print {$run{LOG}} "$program_name: processing $prefix in $path\n";
my %missing;
foreach my $mandatory_arch (@{$config->{mandatory_arch}}, 'src') {
+ $excluded{$prefix}{$mandatory_arch} and next;
print {$run{LOG}} "$program_name: checking if mandatory architecture $mandatory_arch is present: ";
if (!$pkg_tree{$prefix}{arch}{$mandatory_arch} && !$pkg_tree{$prefix}{arch}{noarch}){
if (!$cache->{arch}{$prefix}{$mandatory_arch}) {
@@ -177,7 +185,9 @@ foreach my $prefix (keys %pkg_tree) {
}
# delete the files which should have heen either put in queue or rejected
unlink $_ foreach @packages;
- unlink "$done/$path/$prefix.youri"
+ unlink "$done/$path/$prefix.youri";
+ # unlink the sources rpm, other arch will be able to grab it into the repository
+ unlink "$todo/$path/${prefix}_$_" foreach @{$pkg_tree{$prefix}{srpms}}
} else {
print {$run{LOG}} "WARNING $program_name: mandatory arch (", join(' ', keys %missing),") are missing for $prefix, waiting\n"
}