From 237d0b3f6644531d364df1233d052d2bf9220017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0smail=20D=C3=B6nmez?= Date: Sat, 15 Dec 2007 12:11:52 +0000 Subject: [PATCH] didn't mean to commit these --- pisi/actionsapi/pythonmodules.py | 2 +- pisi/archive.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pisi/actionsapi/pythonmodules.py b/pisi/actionsapi/pythonmodules.py index cb9325e9..0babdac6 100644 --- a/pisi/actionsapi/pythonmodules.py +++ b/pisi/actionsapi/pythonmodules.py @@ -50,7 +50,7 @@ def compile(parameters = ''): def install(parameters = ''): '''does python setup.py install''' - if system('python setup.py install --root=%s --install-lib=/usr/lib/site-python --no-compile -O0 %s' % (get.installDIR(), parameters)): + if system('python setup.py install --root=%s --no-compile -O0 %s' % (get.installDIR(), parameters)): raise InstallError, _('Install failed.') DDOCS = 'CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS PKG-INFO \ diff --git a/pisi/archive.py b/pisi/archive.py index a0b5db48..c2a24ef2 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: