adopt to new lzma

This commit is contained in:
İsmail Dönmez
2007-12-29 21:59:26 +00:00
parent a4ef1c5b31
commit 1fdd630865
+3 -4
View File
@@ -114,8 +114,7 @@ class ArchiveTar(ArchiveBase):
elif self.type == 'tarlzma': elif self.type == 'tarlzma':
rmode = 'r:' rmode = 'r:'
self.file_path = self.file_path.rstrip(ctx.const.lzma_suffix) self.file_path = self.file_path.rstrip(ctx.const.lzma_suffix)
ret, out, err = util.run_batch("lzma d %s %s" % (self.file_path + ctx.const.lzma_suffix, ret, out, err = util.run_batch("lzma -k -f -d %s%s" % (self.file_path,ctx.const.lzma_suffix))
self.file_path))
if ret != 0: if ret != 0:
raise LzmaRuntimeError(err) raise LzmaRuntimeError(err)
else: else:
@@ -190,9 +189,9 @@ class ArchiveTar(ArchiveBase):
if self.tar.mode == 'wb' and self.type == 'tarlzma': if self.tar.mode == 'wb' and self.type == 'tarlzma':
batch = None batch = None
if ctx.config.values.build.compressionlevel: if ctx.config.values.build.compressionlevel:
batch = "lzmash -%s %s" % (ctx.config.values.build.compressionlevel, self.file_path) batch = "lzma -%s -z %s" % (ctx.config.values.build.compressionlevel, self.file_path)
else: else:
batch = "lzmash %s" % self.file_path batch = "lzma -z %s" % self.file_path
ret, out, err = util.run_batch(batch) ret, out, err = util.run_batch(batch)
if ret != 0: if ret != 0: