aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Pipkin <j@dawnrazor.net>2012-11-04 08:33:54 -0600
committerJacob Pipkin <j@dawnrazor.net>2012-11-04 08:33:54 -0600
commita7adf75786aa7496db52998ff0f918bfb99a685e (patch)
tree15edbccd53420dbcc2e51afaa96d0d12bfb0dc00
parent23751d7cf1774684214ce7f210456d74f5eb683a (diff)
downloadsbotools2-a7adf75786aa7496db52998ff0f918bfb99a685e.tar.xz
changes to support get_sbo_location changes
-rw-r--r--sboupgradex9
1 files changed, 3 insertions, 6 deletions
diff --git a/sboupgradex b/sboupgradex
index 178adee..83128e1 100644
--- a/sboupgradex
+++ b/sboupgradex
@@ -82,7 +82,6 @@ my $rootpkg = $ARGV[0];
my %warnings;
my %options;
my $build_queue;
-my %locations;
if ($no_reqs) {
@$build_queue = ();
@@ -91,9 +90,7 @@ if ($no_reqs) {
$build_queue = get_build_queue($rootpkg, \%warnings);
}
-for my $sbo (@$build_queue) {
- $locations{$sbo} = get_sbo_location $sbo;
-}
+my %locations = get_sbo_location ($build_queue);
sub get_readme_path ($) {
exists $_[0] or script_error 'get_readme_path requires an argument.';
@@ -327,7 +324,7 @@ goto BEGIN_BUILD unless $install_new;
for my $sbo (@$build_queue) {
my $name = $compat32 ? "$sbo-compat32" : $sbo;
warn "$name already installed.\n" and next if $name ~~ @$inst_names;
- $locations{$name} = get_sbo_location $sbo if $compat32;
+ $locations{$name} = get_sbo_location ($sbo) if $compat32;
unless ($non_int) {
# if compat32 is TRUE, we need to see if the non-compat version exists.
if ($compat32) {
@@ -370,4 +367,4 @@ print_failures %failures;
%failures = process_sbos $build_queue if exists $$build_queue[0];
print_failures %failures;
-exit 0; \ No newline at end of file
+exit 0;