From 4edab9788a284886731f41a1bb522ba5d814a142 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 19 Apr 2014 11:27:16 +0200 Subject: perl_checker cleanups --- ulri | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'ulri') diff --git a/ulri b/ulri index d64c32b..0e8f36e 100755 --- a/ulri +++ b/ulri @@ -86,7 +86,7 @@ my %config_usage = ( localhost => { iurt => { user => 'builder', - command => "iurt --copy_srpm --group --config local_spool /home/builder/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://localhost/distrib/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__", + command => qq(iurt --copy_srpm --group --config local_spool /home/builder/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://localhost/distrib/ -p "__PACKAGER__" -r __TARGET__ __ARCH__), packages => '/home/builder/iurt/', } , }, @@ -283,7 +283,7 @@ sub todo_func { my @deps; open my $FILE, "<$todo/$f/$m/$s/$r"; - while(my $line = <$FILE>) { + while (my $line = <$FILE>) { chomp $line; plog('DEBUG', "Adding dependency $line ($prefix)"); push @deps,$line; @@ -536,7 +536,7 @@ foreach my $prefix (sort keys %pkg_tree) { # $dep was not uploaded yet, so it's too early to build this one plog('DEBUG', "Dependent build $dep not ready ($prefix)"); $ready = 0; - if (glob "$reject/*/*/*/$dep.youri" || glob "$done/*/*/*/${dep}_*.fail") { + if (glob("$reject/*/*/*/$dep.youri") || glob("$done/*/*/*/${dep}_*.fail")) { plog('ERROR', "Dependent build $dep has failed"); $failed_dep = 1; } @@ -546,10 +546,9 @@ foreach my $prefix (sort keys %pkg_tree) { plog('DEBUG', "Dependent build(s) failed, rejecting this one"); foreach my $media (keys %{$ent->{media}}) { my $path = $ent->{media}{$media}{path}; - my $target = $ent->{target}; make_path("$reject/$path"); foreach my $srpm (@{$ent->{srpms}}) { - move("$todo/$path/${prefix}_$srpm","$reject/$path/${prefix}_$srpm"); + move("$todo/$path/${prefix}_$srpm", "$reject/$path/${prefix}_$srpm"); } } next; -- cgit v1.2.1