sbotools2

commit 217a64cf4287c791d1cdb3ebed409a785044034f
parent df25270d39ca7bc86608051add1abbba949f0961
Author: Jacob Pipkin <d4wnr4z0r@yahoo.com>
Date:   Sun, 27 May 2012 16:32:45 -0500

fix bug where the code determining pkg name found the original pkg for -compat32s instead of the converted pkg

Diffstat:
M
SBO-Lib/lib/SBO/Lib.pm
 | 
9
++++++---

1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm
@@ -596,11 +596,14 @@ sub sb_compat32 {
 	}
 	my @symlinks = create_symlinks ($location, @downloads);
 	my ($pkg, $src) = perform_sbo ($jobs, $sbo, $location, $arch, 1, 1);
-	my $cmd = '/usr/sbin/convertpkg-compat32';
-	my @args = ('-i', "$pkg", '-d', '/tmp');
-	my $out = system ($cmd, @args);
+	my ($tempfh, $tempfn) = make_temp_file ();
+	close ($tempfh);
+	my $cmd = "/usr/sbin/convertpkg-compat32 -i $pkg -d /tmp | tee $tempfn";
+	my $out = system ($cmd);
 	unlink ($_) for @symlinks;
 	die unless $out == 0;
+	unlink $pkg;
+	$pkg = get_pkg_name ($tempfn);
 	return $pkg, $src;
 }