diff options
author | Jacob Pipkin <j@dawnrazor.net> | 2012-11-05 04:17:21 -0600 |
---|---|---|
committer | Jacob Pipkin <j@dawnrazor.net> | 2012-11-05 04:17:21 -0600 |
commit | 75e942f3d49edd7fd0c58c0c5f2a3c382632feac (patch) | |
tree | 2009bae2819a471ff94a3d50a34871746d40e7d7 | |
parent | ee3be93c8b42928a5d6edb2b763c209eeda4d643 (diff) | |
download | sbotools2-75e942f3d49edd7fd0c58c0c5f2a3c382632feac.tar.xz |
get rid of prototype for print_failures, all tests pass
-rwxr-xr-x | sboupgrade | 10 | ||||
-rw-r--r-- | sboupgradex | 10 |
2 files changed, 8 insertions, 12 deletions
@@ -313,13 +313,11 @@ sub process_sbos ($) { return %failures; } -sub print_failures (;%) { +sub print_failures { if (exists $_[0]) { my %failures = @_; say 'Failures:'; - while (my ($key, $val) = each %failures) { - say " $key: $val"; - } + say " $_: $failures{$_}" for keys %failures; exit 1; } } @@ -365,7 +363,7 @@ unless ($force) { } } my %failures = process_sbos $todo_upgrade if exists $$todo_upgrade[0]; -print_failures %failures; +print_failures (%failures); INSTALL_NEW: exit 0 unless $install_new; @@ -397,6 +395,6 @@ FIRST: for my $sbo (@ARGV) { push @$todo_install, $sbo; } %failures = process_sbos $todo_install if exists $$todo_install[0]; -print_failures %failures; +print_failures (%failures); exit 0; diff --git a/sboupgradex b/sboupgradex index 9612771..1eb325b 100644 --- a/sboupgradex +++ b/sboupgradex @@ -236,13 +236,11 @@ sub process_sbos ($) { return %failures; } -sub print_failures (;%) { +sub print_failures { if (exists $_[0]) { my %failures = @_; say 'Failures:'; - while (my ($key, $val) = each %failures) { - say " $key: $val"; - } + say " $_: $failures{$_}" for keys %failures; exit 1; } } @@ -362,9 +360,9 @@ unless ($non_int) { } my %failures = process_sbos $upgrade_queue if exists $$upgrade_queue[0]; -print_failures %failures; +print_failures (%failures); %failures = process_sbos $build_queue if exists $$build_queue[0]; -print_failures %failures; +print_failures (%failures); exit 0; |