diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-12-17 13:24:25 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-12-17 13:24:25 +0000 |
| commit | 5a76ab8943e6a87cc34f6b269e9b819ed8890f8c (patch) | |
| tree | 0368d11bf57e3a17dbee8cb0a56f1b61b81f8d7b | |
| parent | 0701eb7e7a89556e56368aa738a42e63bc459303 (diff) | |
| download | rpmtools-5a76ab8943e6a87cc34f6b269e9b819ed8890f8c.tar rpmtools-5a76ab8943e6a87cc34f6b269e9b819ed8890f8c.tar.gz rpmtools-5a76ab8943e6a87cc34f6b269e9b819ed8890f8c.tar.bz2 rpmtools-5a76ab8943e6a87cc34f6b269e9b819ed8890f8c.tar.xz rpmtools-5a76ab8943e6a87cc34f6b269e9b819ed8890f8c.zip | |
Ensure Packdrakeng::zlib loads properly, and is not used if Compress::Zlib
is not available
| -rw-r--r-- | Packdrakeng.pm | 1 | ||||
| -rw-r--r-- | Packdrakeng/zlib.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Packdrakeng.pm b/Packdrakeng.pm index f860557..5fa03cf 100644 --- a/Packdrakeng.pm +++ b/Packdrakeng.pm @@ -139,6 +139,7 @@ sub choose_compression_method { $pack->{compress_method} ||= "gzip"; if (!$pack->{force_extern}) { eval { + require Compress::Zlib; #- need this to ensure that Packdrakeng::zlib will load properly require Packdrakeng::zlib; $pack->{subcompress} = \&Packdrakeng::zlib::gzip_compress; $pack->{subuncompress} = \&Packdrakeng::zlib::gzip_uncompress; diff --git a/Packdrakeng/zlib.pm b/Packdrakeng/zlib.pm index d541a67..d975060 100644 --- a/Packdrakeng/zlib.pm +++ b/Packdrakeng/zlib.pm @@ -147,4 +147,4 @@ sub gzip_uncompress { $byteswritten } - +1; |