commit 1862adcb7db0e27fc2da2f3409f31a8f1fd44c3d parent e703434bcbe3c11ecae9c710241516d1c7fdebec Author: J Pipkin <j@dawnrazor.net> Date: Sat, 30 Mar 2013 12:27:35 -0500 Merge branch 'non_cpan', fixes #54 Diffstat:
| M | sboinstall | | | 12 | +++++++----- |
| M | sboupgrade | | | 1 | + |
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git 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; diff --git 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);