From 1086534ccdaeea2061b3c53646bb0dbed009dd34 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 2 Jun 2006 18:59:39 +0000 Subject: [PATCH] =?UTF-8?q?*=20temizleyecek=20tek=20dosyam=C4=B1z=20olsun.?= =?UTF-8?q?=20*=20run=5Fbatch=20ile=20ilgili=20durumu=20FIXME=20ile=20hat?= =?UTF-8?q?=C4=B1rlat.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/archive.py | 6 ++++-- pisi/build.py | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pisi/archive.py b/pisi/archive.py index 5c87614d..deeec989 100644 --- a/pisi/archive.py +++ b/pisi/archive.py @@ -94,6 +94,7 @@ class ArchiveTar(ArchiveBase): self.file_path = self.file_path.rstrip('.lzma') ret, out, err = util.run_batch("lzma d %s %s" % (self.file_path + '.lzma', self.file_path)) if ret != 0: + #FIXME: see bug #2836 raise LZMAError(out) else: raise ArchiveError(_("Archive type not recognized")) @@ -149,12 +150,13 @@ class ArchiveTar(ArchiveBase): if self.tar.mode == 'wb' and self.type == 'tarlzma': batch = None if ctx.config.values.build.compressionlevel: - batch = "lzmash -k -%s %s" % (ctx.config.values.build.compressionlevel, self.file_path) + batch = "lzmash -%s %s" % (ctx.config.values.build.compressionlevel, self.file_path) else: - batch = "lzmash -k %s" % self.file_path + batch = "lzmash %s" % self.file_path ret, out, err = util.run_batch(batch) if ret != 0: + #FIXME: see bug #2836 raise LZMAError(out) class ArchiveZip(ArchiveBase): diff --git a/pisi/build.py b/pisi/build.py index 239a52de..03e549af 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -823,7 +823,6 @@ class Builder: tar.close() pkg.add_to_package("install.tar.lzma") pkg.close() - os.unlink("install.tar") os.unlink("install.tar.lzma") os.chdir(c)