aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxocel <xocel@iquidus.org>2013-01-14 03:19:20 +1300
committerxocel <xocel@iquidus.org>2013-01-14 03:19:20 +1300
commitc78f576382c99d830b56d9f97e97c0ead1c5fe46 (patch)
tree373a625d9c0844b5e39faac3ff3daffc2dd3a159
parenta5aa3197c73272fa618eff85bc8745c594b36e92 (diff)
parentf46f97612dc1d9b040b17e06eaffcb7dd5aeba06 (diff)
downloadsbotools2-c78f576382c99d830b56d9f97e97c0ead1c5fe46.tar.xz
Merge branch 'readme_opt'
-rwxr-xr-xsboremove7
1 files changed, 1 insertions, 6 deletions
diff --git a/sboremove b/sboremove
index 0aa0fb8..838ec8b 100755
--- a/sboremove
+++ b/sboremove
@@ -69,10 +69,6 @@ for my $sbo (@sbos) {
$remove_queue = merge_queues($remove_queue, $queue);
}
-# Read requires for each item in queue (needed for later on, %README% etc)
-my %req_store;
-$req_store{$_} = get_requires $_ for @$remove_queue;
-
# Determine required by for all installed sbo's
my (%required_by, @confirmed);
@@ -144,8 +140,7 @@ FIRST: for my $remove (@$remove_queue) {
}
# Check for %README% value and inform user.
- my @reqz = $req_store{$remove};
- if ( "%README%" ~~ @reqz ) {
+ if ( $warnings{$remove} ) {
say "It is recommended that you view the README before continuing.";
print "Display README now? [y]: ";
if (<STDIN> =~ /^[Yy\n]/) {