Merge branch 'non_cpan', fixes #54

2 files changed, 8 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;
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);