diff --git a/pisi/__init__.py b/pisi/__init__.py index 9fd9f8e8..830c6c22 100644 --- a/pisi/__init__.py +++ b/pisi/__init__.py @@ -12,9 +12,9 @@ # PiSi version -__version__ = "1.1_beta3" +__version__ = "1.1_beta4" -__dbversion__ = "1.1_beta3" +__dbversion__ = "1.1_beta4" __filesdbversion__ = "1.0.5" # yes, this is the real bottleneck __all__ = [ 'api', 'config', 'packagedb', 'installdb', 'search' ] diff --git a/pisi/archive.py b/pisi/archive.py index 3e606f29..c3bfa8c5 100644 --- a/pisi/archive.py +++ b/pisi/archive.py @@ -102,7 +102,7 @@ class ArchiveZip(ArchiveBase): zip archives.""" symmagic = 2716663808 #long of hex val '0xA1ED0000L' - comp_method = {'lzma': zipfileext.ZIP_LZMA, 'deflated': zipfileext.ZIP_DEFLATED} + comp_method = {'lzma': zipfileext.ZIP_LZMA_BOGUS, 'deflated': zipfileext.ZIP_DEFLATED} def __init__(self, file_path, arch_type = "zip", mode = 'r'): super(ArchiveZip, self).__init__(file_path, arch_type) @@ -134,7 +134,7 @@ class ArchiveZip(ArchiveBase): else: method = ctx.get_option('compression_method') if not method: - self.zip_obj.write(file_name, arc_name, zipfileext.ZIP_LZMA) + self.zip_obj.write(file_name, arc_name, zipfileext.ZIP_LZMA_BOGUS) else: self.zip_obj.write(file_name, arc_name, self.comp_method[method]) diff --git a/tests/zipfileexttests.py b/tests/zipfileexttests.py index 6a8517e5..6786d21a 100644 --- a/tests/zipfileexttests.py +++ b/tests/zipfileexttests.py @@ -49,6 +49,6 @@ class ZipFileExtCase(testcase.TestCase): self.genericTestZipUnzip(ZIP_DEFLATED) def testLzmaZipUnzip(self): - self.genericTestZipUnzip(ZIP_LZMA) + self.genericTestZipUnzip(ZIP_LZMA_BOGUS) suite = unittest.makeSuite(ZipFileExtCase)