diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-04-04 15:31:54 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-04-04 15:31:54 +0000 |
| commit | 0bad992b302944a6a5b51faf6a73bf6b3d6bb613 (patch) | |
| tree | 36cd1eb1a3879ed85e78ca7d763d902f83fe366c | |
| parent | 9c6fe669a31d9d78fd3d19db0bd2fcedf808a7d5 (diff) | |
| download | rpmtools-0bad992b302944a6a5b51faf6a73bf6b3d6bb613.tar rpmtools-0bad992b302944a6a5b51faf6a73bf6b3d6bb613.tar.gz rpmtools-0bad992b302944a6a5b51faf6a73bf6b3d6bb613.tar.bz2 rpmtools-0bad992b302944a6a5b51faf6a73bf6b3d6bb613.tar.xz rpmtools-0bad992b302944a6a5b51faf6a73bf6b3d6bb613.zip | |
packdrake: remove dirty message when decompressing without Compress::Zlib5.0.20
| -rw-r--r-- | Packdrakeng.pm | 5 | ||||
| -rw-r--r-- | rpmtools.spec | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Packdrakeng.pm b/Packdrakeng.pm index 38ff2d8..f46c2b6 100644 --- a/Packdrakeng.pm +++ b/Packdrakeng.pm @@ -398,7 +398,10 @@ sub extern_uncompress { } close($tempfh); - CORE::open($pack->{ustream_data}{handle}, "cat '$pack->{ustream_data}{tempname}' | $pack->{uncompress_method} |") or do { + my $cmd = $pack->{uncompress_method} eq 'gzip -d' || $pack->{uncompress_method} eq 'bzip2 -d' ? + "$pack->{uncompress_method} -c '$pack->{ustream_data}{tempname}'" : + "$pack->{uncompress_method} < '$pack->{ustream_data}{tempname}'"; + CORE::open($pack->{ustream_data}{handle}, "$cmd |") or do { $pack->{log}("Can't start $pack->{uncompress_method} to uncompress data"); unlink($pack->{ustream_data}{tempname}); $pack->{ustream_data} = undef; diff --git a/rpmtools.spec b/rpmtools.spec index 057695e..7c9fe53 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,8 +1,8 @@ %define name rpmtools %define release %mkrel 1 -# do not modify here, see Makefile in the CVS -%define version 5.0.19 +# do not modify here, see spec file in the CVS +%define version 5.0.20 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"') %define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm) @@ -79,6 +79,9 @@ is fully compatible with old packdrake. %{_mandir}/man3/[pP]ackdrake* %changelog +* Mon Apr 4 2005 Pixel <pixel@mandrakesoft.com> 5.0.20-1mdk +- packdrake: remove dirty message when decompressing without Compress::Zlib + * Tue Mar 29 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 5.0.19-1mdk - gendistrib: fix a bug in creation of media_info directories |