didn't mean to commit these

This commit is contained in:
İsmail Dönmez
2007-12-15 12:11:52 +00:00
parent bcd7eb5241
commit 237d0b3f66
2 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -50,7 +50,7 @@ def compile(parameters = ''):
def install(parameters = ''): def install(parameters = ''):
'''does python setup.py install''' '''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.') raise InstallError, _('Install failed.')
DDOCS = 'CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS PKG-INFO \ DDOCS = 'CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS PKG-INFO \
+4 -3
View File
@@ -114,7 +114,8 @@ 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 -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: if ret != 0:
raise LzmaRuntimeError(err) raise LzmaRuntimeError(err)
else: else:
@@ -189,9 +190,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 = "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: else:
batch = "lzma -z %s" % self.file_path batch = "lzmash %s" % self.file_path
ret, out, err = util.run_batch(batch) ret, out, err = util.run_batch(batch)
if ret != 0: if ret != 0: