From 6a167420d01d56bbe84d7a1a4becad32deb0710f Mon Sep 17 00:00:00 2001 From: J Pipkin Date: Sat, 9 Mar 2013 03:28:31 -0600 Subject: set @$upgrade_queue back to @temp_queue after running user_prompt() for each @$upgrade_queue --- sboupgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/sboupgrade b/sboupgrade index 762ce3f..7caea68 100755 --- a/sboupgrade +++ b/sboupgrade @@ -209,6 +209,7 @@ FIRST: for my $sbo (@$upgrade_queue) { say "\n$sbo added to upgrade queue."; } } +@$upgrade_queue = @temp_queue; exit 0 unless exists $$upgrade_queue[0]; say "\nUpgrade queue: ". join(' ', @$upgrade_queue); -- cgit v1.2.3 From be8ce6dd3efa75e020b5caae6544bc25b2a8d40f Mon Sep 17 00:00:00 2001 From: J Pipkin Date: Thu, 28 Mar 2013 06:52:57 -0500 Subject: fix cpan-searching regex to include ^ and $, dont check against cpan unless sbo =~ /^perl-/ --- sboinstall | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sboinstall b/sboinstall index d65831b..0f87d5a 100755 --- a/sboinstall +++ b/sboinstall @@ -117,11 +117,13 @@ FIRST: for my $sbo (@$build_queue) { say "$name already installed."; next FIRST; } else { - my $pm_name = $sbo; - $pm_name =~ s/^perl-//; - if (/$pm_name/i ~~ @$pms) { - say "$sbo installed via the cpan."; - next FIRST; + if ($sbo =~ /^perl-/) { + my $pm_name = $sbo; + $pm_name =~ s/^perl-//; + if (/^$pm_name$/i ~~ @$pms) { + say "$sbo installed via the cpan."; + next FIRST; + } } } $locations{$name} = get_sbo_location($sbo) if $compat32; -- cgit v1.2.3