* we're going to beta4, and there was in fact a db fix that demands
a db version bump too * change LZMA to LZMA_BOGUS, why, because it is bogus, we don't have the official id yet, and also make that code mergeable with devel branch
This commit is contained in:
+2
-2
@@ -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' ]
|
||||
|
||||
+2
-2
@@ -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])
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user