From 3dfa9294421bcf117265692294c0c72c41711ac4 Mon Sep 17 00:00:00 2001
From: J Pipkin <j@dawnrazor.net>
Date: Fri, 4 Jan 2013 03:05:02 -0600
Subject: stop pulling version, integrate into sboupgrade

---
 sboupgrade | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'sboupgrade')

diff --git a/sboupgrade b/sboupgrade
index daa6799..d580667 100755
--- a/sboupgrade
+++ b/sboupgrade
@@ -319,24 +319,35 @@ FIRST: for my $sbo (@$upgrade_queue) {
 
 INSTALL_NEW:
 goto BEGIN_BUILD unless $install_new;
+
+my $pms = get_installed_cpans;
+s/::/-/g for @$pms;
+
 @temp_queue = ();
 FIRST: for my $sbo (@$build_queue) {
     my $name = $compat32 ? "$sbo-compat32" : $sbo;
     if ($name ~~ @$inst_names) {
         say "$name already installed." unless $force; 
         next FIRST;
-    } 
+    } else {
+		my $pm_name = $name;
+		$name =~ s/^perl-//g;
+		if (/$pm_name/i ~~ @$pms) {
+			say "$name installed via the cpan." unless $force;
+			next FIRST;
+		}
+	}
     $locations{$name} = get_sbo_location($sbo) if $compat32;
     unless ($non_int) {
         # if compat32 is TRUE, we need to see if the non-compat version exists.
         if ($compat32) {
             unless ($sbo ~~ @$inst_names or $sbo ~~ @$upgrade_queue) {
                 if (user_prompt($sbo, $locations{$sbo})){
-                    push(@temp_queue, $sbo);
-                    say "$sbo added to install queue.";
-                } else {
-                    last FIRST;
-                }
+  	               	push(@temp_queue, $sbo);
+  	               	say "$sbo added to install queue.";
+  	           	} else {
+  	               	last FIRST;
+  	           	}
             } 
         }
         if (user_prompt($name, $locations{$name})) {
-- 
cgit v1.2.3


From 6ab8aecc0a9e01b970ceed7a2b2e3dd9f68b1012 Mon Sep 17 00:00:00 2001
From: xocel <xocel@iquidus.org>
Date: Sat, 5 Jan 2013 12:55:49 +1300
Subject: replaced  =~ s/^perl-//g; with  =~ ...

---
 sboupgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sboupgrade')

diff --git a/sboupgrade b/sboupgrade
index d580667..a98253c 100755
--- a/sboupgrade
+++ b/sboupgrade
@@ -331,7 +331,7 @@ FIRST: for my $sbo (@$build_queue) {
         next FIRST;
     } else {
 		my $pm_name = $name;
-		$name =~ s/^perl-//g;
+		$pm_name =~ s/^perl-//g;
 		if (/$pm_name/i ~~ @$pms) {
 			say "$name installed via the cpan." unless $force;
 			next FIRST;
-- 
cgit v1.2.3