aboutsummaryrefslogtreecommitdiff
path: root/SBO-Lib/lib
diff options
context:
space:
mode:
authorJacob Pipkin <d4wnr4z0r@yahoo.com>2012-05-27 16:32:45 -0500
committerJacob Pipkin <d4wnr4z0r@yahoo.com>2012-05-27 16:32:45 -0500
commit217a64cf4287c791d1cdb3ebed409a785044034f (patch)
treedbb4057b55c0760f8c05138e2dbaedc28b86b9d4 /SBO-Lib/lib
parentdf25270d39ca7bc86608051add1abbba949f0961 (diff)
downloadsbotools2-217a64cf4287c791d1cdb3ebed409a785044034f.tar.xz
fix bug where the code determining pkg name found the original pkg for -compat32s instead of the converted pkg
Diffstat (limited to 'SBO-Lib/lib')
-rw-r--r--SBO-Lib/lib/SBO/Lib.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm
index dfd4dc3..5569d43 100644
--- 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;
}