From 217a64cf4287c791d1cdb3ebed409a785044034f Mon Sep 17 00:00:00 2001 From: Jacob Pipkin Date: Sun, 27 May 2012 16:32:45 -0500 Subject: fix bug where the code determining pkg name found the original pkg for -compat32s instead of the converted pkg --- SBO-Lib/lib/SBO/Lib.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'SBO-Lib/lib/SBO/Lib.pm') 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; } -- cgit v1.2.3