* temizleyecek tek dosyamız olsun.
* run_batch ile ilgili durumu FIXME ile hatırlat.
This commit is contained in:
+4
-2
@@ -94,6 +94,7 @@ class ArchiveTar(ArchiveBase):
|
|||||||
self.file_path = self.file_path.rstrip('.lzma')
|
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))
|
ret, out, err = util.run_batch("lzma d %s %s" % (self.file_path + '.lzma', self.file_path))
|
||||||
if ret != 0:
|
if ret != 0:
|
||||||
|
#FIXME: see bug #2836
|
||||||
raise LZMAError(out)
|
raise LZMAError(out)
|
||||||
else:
|
else:
|
||||||
raise ArchiveError(_("Archive type not recognized"))
|
raise ArchiveError(_("Archive type not recognized"))
|
||||||
@@ -149,12 +150,13 @@ 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 -k -%s %s" % (ctx.config.values.build.compressionlevel, self.file_path)
|
batch = "lzmash -%s %s" % (ctx.config.values.build.compressionlevel, self.file_path)
|
||||||
else:
|
else:
|
||||||
batch = "lzmash -k %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:
|
||||||
|
#FIXME: see bug #2836
|
||||||
raise LZMAError(out)
|
raise LZMAError(out)
|
||||||
|
|
||||||
class ArchiveZip(ArchiveBase):
|
class ArchiveZip(ArchiveBase):
|
||||||
|
|||||||
@@ -823,7 +823,6 @@ class Builder:
|
|||||||
tar.close()
|
tar.close()
|
||||||
pkg.add_to_package("install.tar.lzma")
|
pkg.add_to_package("install.tar.lzma")
|
||||||
pkg.close()
|
pkg.close()
|
||||||
os.unlink("install.tar")
|
|
||||||
os.unlink("install.tar.lzma")
|
os.unlink("install.tar.lzma")
|
||||||
|
|
||||||
os.chdir(c)
|
os.chdir(c)
|
||||||
|
|||||||
Reference in New Issue
Block a user