aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Pipkin <j@dawnrazor.net>2012-11-30 05:40:11 -0600
committerJacob Pipkin <j@dawnrazor.net>2012-11-30 05:40:11 -0600
commit317db7ea3e8e4b908e2c918310ecb3fe29569f4b (patch)
tree9aa613dd693becf718072d9e4053aa03bc65a971
parent7a9cf85bad2bcba6648f50818ab44ef303609228 (diff)
downloadsbotools2-317db7ea3e8e4b908e2c918310ecb3fe29569f4b.tar.xz
sboupgrade -f blah shouldnt install blah if its not already installed
-rwxr-xr-xsboupgrade15
1 files changed, 6 insertions, 9 deletions
diff --git a/sboupgrade b/sboupgrade
index d3e6fb5..3d93e1e 100755
--- a/sboupgrade
+++ b/sboupgrade
@@ -263,20 +263,17 @@ unless ($force) {
# but without force, we only want to update what there are updates for
unless ($force) {
for my $sbo (@$build_queue) {
- if ($sbo ~~ @updates) {
- push @$upgrade_queue, $sbo;
- }
+ push @$upgrade_queue, $sbo if $sbo ~~ @updates;
}
} else {
- if ( $force_reqs ) {
+ if ($force_reqs) {
for my $sbo (@$build_queue) {
- if ($sbo ~~ @$inst_names) {
- push @$upgrade_queue, $sbo;
- }
+ push @$upgrade_queue, $sbo if $sbo ~~ @$inst_names;
}
} else {
- $upgrade_queue = \@ARGV;
- $install_new = 1;
+ for my $sbo (@ARGV) {
+ push @$upgrade_queue, $sbo if $sbo ~~ @$inst_names;
+ }
}
}