bug-fixes to make the -j stuff work

3 files changed, 16 insertions, 8 deletions

diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm
index 8d9c418..3989d3a 100644
--- a/SBO-Lib/lib/SBO/Lib.pm
+++ b/SBO-Lib/lib/SBO/Lib.pm
@@ -51,9 +51,9 @@ our $conf_file = "$conf_dir/sbotools.conf";
 my @valid_conf_keys = (
 	'NOCLEAN',
 	'DISTCLEAN',
-#	"JOBS",
+	'JOBS',
 	'PKG_DIR',
-	'SBO_HOME'
+	'SBO_HOME',
 );
 
 our %config;
@@ -551,7 +551,7 @@ sub sb_compat32 {
 	}
 	my @symlinks = create_symlinks ($location,@downloads);
 	prep_sbo_file ($sbo,$location);
-	perform_sbo ($sbo,$location,$arch,1,1);
+	perform_sbo ($jobs,$sbo,$location,$arch,1,1);
 	my $pkg = get_pkg_name ($sbo,$version,'FALSE');
 	my $cmd = '/usr/sbin/convertpkg-compat32';
 	my @args = ('-i',"$pkg",'-d','/tmp');
diff --git a/sboinstall b/sboinstall
index 0f9566d..db65863 100755
--- a/sboinstall
+++ b/sboinstall
@@ -40,11 +40,16 @@ show_version () and exit(0) if exists $options{v};
 
 show_usage () and exit (0) unless exists $ARGV[0];
 
-my @opts = ('c','d','r','i','p','j');
-for my $opt (@opts) {
+my @opts1 = ('c','d','r','i','p');
+for my $opt (@opts1) {
 	unshift (@ARGV,"-$opt") if exists $options{$opt};
 }
 
+my @opts2 = ('j');
+for my $opt (@opts2) {
+	unshift (@ARGV,"-$opt $options{$opt}") if exists $options{$opt};
+}
+
 my $string = '';
 for my $arg (@ARGV) {
 	$string .= " $arg";
diff --git a/sboupgrade b/sboupgrade
index a6a29d2..4c8247e 100755
--- a/sboupgrade
+++ b/sboupgrade
@@ -43,7 +43,6 @@ EOF
 my %options;
 getopts ('hvacdfj:Nriop',\%options);
 
-
 show_usage () && exit (0) if exists $options{h};
 show_version () && exit (0) if exists $options{v};
 my $noclean = exists $options{c} ? 'FALSE' : $config{NOCLEAN};
@@ -119,8 +118,12 @@ sub process_sbos {
 					mkdir ($config{PKG_DIR}) or 
 						warn "Unable to create $config{PKG_DIR}\n";
 				}
-				move ($pkg,$config{PKG_DIR}) if -d $config{PKG_DIR};
-				print "$pkg stored in $config{PKG_DIR}\n";
+				if (-d $config{PKG_DIR}) {
+					move ($pkg,$config{PKG_DIR});
+					print "$pkg stored in $config{PKG_DIR}\n";
+				} else {
+					warn "$pkg left in /tmp\n";
+				}
 			} elsif ($distclean eq 'TRUE') {
 				unlink ($pkg);
 			}