From 6385ff2e465f73682d9936c52360c07b4f739f6b Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 4 Feb 2008 14:10:50 +0000 Subject: [PATCH] lzma 4.32 is not in 2007 or 2007-test. Revert this too, for keeping 2007 compatilibity. For trunk/pisi please use lzma 4.27.1 from stable. For all 2008 spesific work please use branches/pisi-devel --- pisi/archive.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pisi/archive.py b/pisi/archive.py index eeb7667c..7a9c42bd 100644 --- a/pisi/archive.py +++ b/pisi/archive.py @@ -114,7 +114,8 @@ class ArchiveTar(ArchiveBase): elif self.type == 'tarlzma': rmode = 'r:' self.file_path = self.file_path.rstrip(ctx.const.lzma_suffix) - ret, out, err = util.run_batch("lzma -k -f -d %s%s" % (self.file_path,ctx.const.lzma_suffix)) + ret, out, err = util.run_batch("lzma d %s %s" % (self.file_path + ctx.const.lzma_suffix, + self.file_path)) if ret != 0: raise LzmaRuntimeError(err) else: @@ -189,9 +190,9 @@ class ArchiveTar(ArchiveBase): if self.tar.mode == 'wb' and self.type == 'tarlzma': batch = None if ctx.config.values.build.compressionlevel: - batch = "lzma -%s -z %s" % (ctx.config.values.build.compressionlevel, self.file_path) + batch = "lzmash -%s %s" % (ctx.config.values.build.compressionlevel, self.file_path) else: - batch = "lzma -z %s" % self.file_path + batch = "lzmash %s" % self.file_path ret, out, err = util.run_batch(batch) if ret != 0: