From 0aa8df3702b2e1d6102ef65202b627b833da613a Mon Sep 17 00:00:00 2001 From: Jacob Pipkin Date: Fri, 30 Nov 2012 08:10:58 -0600 Subject: Revert "fix typo location -> locate, remove broken /-compat32$/ test carried over from old sboupgrade", since that test is actually required This reverts commit 69ee6249b5de2d5458549af868ac8b5ba5f08b38. --- sboupgrade | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sboupgrade b/sboupgrade index 84babc4..775ded9 100755 --- a/sboupgrade +++ b/sboupgrade @@ -109,7 +109,7 @@ if ($no_reqs or $non_int) { } for my $sbo (@$build_queue) { $locations{$sbo} = get_sbo_location ($sbo); - die "Unable to locate $sbo in the SlackBuilds.org tree.\n" unless + die "Unable to location $sbo in the SlackBuilds.org tree.\n" unless defined $locations{$sbo}; } @@ -207,6 +207,9 @@ sub process_sbos ($) { 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, -- cgit v1.2.3