Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* we're going to beta4, and there was in fact a db fix that demands

Browse Source 
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:
Eray Özkural
2006-05-09 12:27:41 +00:00
parent 2c3b5cd556
commit 37a9ff825e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/__init__.py
+2 -2
View File
@@ -12,9 +12,9 @@
# PiSi version # 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 __filesdbversion__ = "1.0.5" # yes, this is the real bottleneck
__all__ = [ 'api', 'config', 'packagedb', 'installdb', 'search' ] __all__ = [ 'api', 'config', 'packagedb', 'installdb', 'search' ]
pisi/archive.py
+2 -2
View File
@@ -102,7 +102,7 @@ class ArchiveZip(ArchiveBase):
zip archives.""" zip archives."""
symmagic = 2716663808 #long of hex val '0xA1ED0000L' 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'): def __init__(self, file_path, arch_type = "zip", mode = 'r'):
super(ArchiveZip, self).__init__(file_path, arch_type) super(ArchiveZip, self).__init__(file_path, arch_type)
@@ -134,7 +134,7 @@ class ArchiveZip(ArchiveBase):
else: else:
method = ctx.get_option('compression_method') method = ctx.get_option('compression_method')
if not 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: else:
self.zip_obj.write(file_name, arc_name, self.comp_method[method]) self.zip_obj.write(file_name, arc_name, self.comp_method[method])
tests/zipfileexttests.py
+1 -1
View File
@@ -49,6 +49,6 @@ class ZipFileExtCase(testcase.TestCase):
self.genericTestZipUnzip(ZIP_DEFLATED) self.genericTestZipUnzip(ZIP_DEFLATED)
def testLzmaZipUnzip(self): def testLzmaZipUnzip(self):
self.genericTestZipUnzip(ZIP_LZMA) self.genericTestZipUnzip(ZIP_LZMA_BOGUS)
suite = unittest.makeSuite(ZipFileExtCase) suite = unittest.makeSuite(ZipFileExtCase)