label loops where loop-control is used

1 files changed, 36 insertions, 41 deletions

diff --git a/sboupgradex b/sboupgradex
index 3d5a5bc..209bd3a 100755
--- a/sboupgradex
+++ b/sboupgradex
@@ -182,44 +182,39 @@ sub process_sbos ($) {
     my $todo = shift;
     my %failures;
     FIRST: for my $sbo (@$todo) {
-        my $opts = 0;
-        $opts = $options{$sbo} if defined $options{$sbo};
-        # switch compat32 on if upgrading a -compat32
-        # else make sure compat32 is off
-        my $cmds = $commands{$sbo} if defined $commands{$sbo};
-        for my $cmd (@$cmds) {
-            system ($cmd) == 0 or warn "\"$cmd\" exited non-zero\n";
-        }
-        if ($sbo =~ /-compat32$/) {
-            $compat32 = 1;
-        } else {
-            $compat32 = 0;
-        }
-        my ($version, $pkg, $src);
-        eval { ($version, $pkg, $src) = do_slackbuild (
-            OPTS    => $opts,
-            JOBS    => $jobs,
-            LOCATION  => $locations{$sbo},
-            COMPAT32  => $compat32,
-        ); };
-        if ($@) {
-            $failures{$sbo} = $@;
-        } else {
-            
-            do_upgradepkg $pkg unless $no_install;      
-
-            unless ($distclean) {
-                make_clean (SBO => $sbo, SRC => $src, VERSION => $version)
-                    unless $noclean;
-            } else {
-                make_distclean (
-                    SBO     => $sbo,
-                    SRC     => $src,
-                    VERSION   => $version,
-                    LOCATION  => $locations{$sbo},
-                );
-            }
-            # move package to $config{PKG_DIR} if defined
+		my $opts = 0;
+		$opts = $options{$sbo} if defined $options{$sbo};
+		my $cmds = $commands{$sbo} if defined $commands{$sbo};
+		for my $cmd (@$cmds) {
+		    system ($cmd) == 0 or warn "\"$cmd\" exited non-zero\n";
+		}
+		# switch compat32 on if upgrading a -compat32
+		# else make sure compat32 is off
+		$compat32 = $sbo =~ /-compat32$/ ? 1 : 0;
+		my ($version, $pkg, $src);
+		eval { ($version, $pkg, $src) = do_slackbuild (
+		    OPTS    => $opts,
+		    JOBS    => $jobs,
+		    LOCATION  => $locations{$sbo},
+		    COMPAT32  => $compat32,
+		); };
+		if ($@) {
+		    $failures{$sbo} = $@;
+		} else {
+		    do_upgradepkg $pkg unless $no_install;      
+
+		    unless ($distclean) {
+		        make_clean (SBO => $sbo, SRC => $src, VERSION => $version)
+		            unless $noclean;
+		    } else {
+		        make_distclean (
+		            SBO     => $sbo,
+		            SRC     => $src,
+		            VERSION   => $version,
+		            LOCATION  => $locations{$sbo},
+		        );
+		    }
+		    # move package to $config{PKG_DIR} if defined
             unless ($config{PKG_DIR} eq 'FALSE') {
                 my $dir = $config{PKG_DIR};
                 unless (-d $dir) {
@@ -299,13 +294,13 @@ for my $sbo (@$upgrade_queue) {
 }
 
 # Remove upgrades from build queue
-for my $sbo (@$upgrade_queue) {
+FIRST: for my $sbo (@$upgrade_queue) {
     if ($sbo ~~ @$build_queue) {
         my $count = 0;
-        for my $i (@$build_queue) {
+        SECOND: for my $i (@$build_queue) {
             if ($i eq $sbo) {
                 splice(@$build_queue, $count, 1);
-                last;
+                last SECOND;
             }
             $count++;
         }