sbotools2

commit c78f576382c99d830b56d9f97e97c0ead1c5fe46
parent a5aa3197c73272fa618eff85bc8745c594b36e92
Author: xocel <xocel@iquidus.org>
Date:   Mon, 14 Jan 2013 03:19:20 +1300

Merge branch 'readme_opt'

Diffstat:
M
sboremove
 | 
7
+------

1 file changed, 1 insertion(+), 6 deletions(-)
diff --git 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]/) {