From 1a3de3d9cddc23c4040fd6cc804da397bc11c311 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 2 Dec 2009 18:48:02 +0000
Subject: perl_checker cleanups

---
 iurt2 | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'iurt2')

diff --git a/iurt2 b/iurt2
index 08ee704..b547109 100755
--- a/iurt2
+++ b/iurt2
@@ -211,10 +211,10 @@ $run{todo} = [];
     sub { ($run{no_compile}) = 1 }, "Setting the no compilation flag" ],
     [ "p", "packager", 1, "<packager>", 
     "Use a specific packager",
-    sub { ($run{packager}) = @_ }, 'Setting packager tag'], 
+    sub { ($run{packager}) = @_ }, 'Setting packager tag' ],
     [ "", "build-user", 1, "<user>", 
     "Use this username to build package",
-    sub { ($run{user}) = @_ }, 'Setting build username'], 
+    sub { ($run{user}) = @_ }, 'Setting build username' ],
     [ "r", "rebuild", -2, "<distro> <architecture> <srpm 1> <srpm 2> ... <srpm n>", 
     "Rebuild the packages, e.g. $program_name -r cooker x86_64 /home/foo/rpm/SRPMS/foo-2.3-12mdv2007.0.src.rpm", 
     sub { 
@@ -230,7 +230,7 @@ $run{todo} = [];
 	    }
 
 	    ($srpm, $path) = fileparse(rel2abs($_));
-	    ($srpm =~ /\.src\.rpm$/) || die "FATAL: $_ doesn't look like an SRPM";
+	    ($srpm =~ /\.src\.rpm$/) or die "FATAL: $_ doesn't look like an SRPM";
 
 	    if (check_arch($_, $run{my_arch})) {
 		plog('DEBUG', "force build for $2 (from $1)");
@@ -332,7 +332,7 @@ $run{todo} = [];
 		sub {
 		    my ($tmp, @media) = @_;
 		    $tmp->[0]{media} = \@media;
-		    1
+		    1;
 		}, "Limiting rebuild to the kernel in the given media regexp"
 	    ],
         ],
@@ -342,7 +342,7 @@ $run{todo} = [];
 	    my ($opt, $media) = @_;
 	    $opt->{repository} = $media;
 	    $run{additional_media} = $opt;
-	    1
+	    1;
 	}, "Activating additional medias"
     ],
     ###############################
@@ -396,11 +396,11 @@ if (-f $configfile) {
 
 if ($run{repository}) {
     plog('DEBUG', "overriding configuration repository by the one given in the command line");
-    $config->{repository} = $run{repository}
+    $config->{repository} = $run{repository};
 }
 
 if (!$config->{repository}) {
-    die "FATAL $program_name: no repository have been defined (use --repository to specify one on the command line"
+    die "FATAL $program_name: no repository have been defined (use --repository to specify one on the command line";
 }
 
 my $urpmi = Iurt::Urpmi->new(run => \%run, config => $config, urpmi_options => "-v --no-verify-rpm --nolock --auto --ignoresize $config->{urpmi_options}");
@@ -1060,7 +1060,7 @@ retry:
 	    $urpmi->add_to_local_media($chroot_tmp, $srpm, $luser);
 	} else { 
 	    # drop packages and logs if we only want failure logs
-	    if($run{delete_on_success}) {
+	    if ($run{delete_on_success}) {
 		system("rm -rf $local_spool/log/$srpm/");
 	    } else {
 		plog('OK', "build successful, copying packages to $local_spool.");
@@ -1084,7 +1084,7 @@ retry:
 	    my (undef, $srpm) = @{$run{todo}[$i]};
 	    if (!$run{done}{$srpm}) {
 		$rebuild = $urpmi->order_packages($union_id, \%provides, $luser);
-		last
+		last;
 	    }
 	}
 	if ($prev_done == $done) {
@@ -1139,7 +1139,7 @@ if ($run{unionfs} && !$run{use_old_chroot}) {
 }
 unlink "$run{pidfile_home}/$run{pidfile}" if $run{pidfile};
 
-exit;
+exit();
 
 
 #
@@ -1177,7 +1177,7 @@ sub check_needed {
 	if ($version) {
 	    $ent->{$name}{version} = $version;
 	}
-	my $v ||= $version;
+	my $v = $version;
 	if ($package) {
 	    plog("ERROR: $srpm needs package $package which requires missing $name $v to be compiled.");
 	} else {
@@ -1345,6 +1345,7 @@ sub check_media {
 		if (open my $syn, "zcat $synthesis_file |") { 
 		    my @prov;
 		    my $nb;
+                    local $_;
 		    while (<$syn>) {
 			if (/^\@provides@(.*)/) {
 			    foreach my $p (split '@', $1) {
-- 
cgit v1.2.1