From 6ad14d2732152374b2d353e5a9bdb02f1640c137 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Tue, 23 May 2006 08:07:17 +0000 Subject: [PATCH] p7zip -> lzmautils conversion --- pisi/archive.py | 14 +++++++------- pisi/build.py | 4 ++-- pisi/package.py | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pisi/archive.py b/pisi/archive.py index 52adbb5d..f80697f0 100644 --- a/pisi/archive.py +++ b/pisi/archive.py @@ -84,10 +84,10 @@ class ArchiveTar(ArchiveBase): rmode = 'r:gz' elif self.type == 'tarbz2': rmode = 'r:bz2' - elif self.type == 'tar7z': + elif self.type == 'tarlzma': rmode = 'r:' - os.system("7z e -y -o%s %s" % (ctx.config.tmp_dir(), self.file_path)) - self.file_path = self.file_path.rstrip('.7z') + self.file_path = self.file_path.rstrip('.lzma') + util.run_batch("lzma d %s %s" % (self.file_path + '.lzma', self.file_path)) else: raise ArchiveError(_("Archive type not recognized")) @@ -108,9 +108,9 @@ class ArchiveTar(ArchiveBase): wmode = 'w:gz' elif self.type == 'tarbz2': wmode = 'w:bz2' - elif self.type == 'tar7z': + elif self.type == 'tarlzma': wmode = 'w:' - self.file_path = self.file_path.rstrip('.7z') + self.file_path = self.file_path.rstrip('.lzma') else: raise ArchiveError(_("Archive type not recognized")) self.tar = tarfile.open(self.file_path, wmode) @@ -118,8 +118,8 @@ class ArchiveTar(ArchiveBase): self.tar.add(file_name, arc_name) def close(self): - if self.tar.mode == 'wb' and self.type == 'tar7z': - os.system("7z a -mx=9 %s %s" % (self.file_path + '.7z', self.file_path)) + if self.tar.mode == 'wb' and self.type == 'tarlzma': + util.run_batch("lzma e -a2 -d26 -fb64 %s %s" % (self.file_path, self.file_path + '.lzma')) self.tar.close() diff --git a/pisi/build.py b/pisi/build.py index 2d9695ae..463a181f 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -801,14 +801,14 @@ class Builder: # created files.xml files = Files() files.read(ctx.const.files_xml) - tar = archive.ArchiveTar("install.tar.7z", "tar7z") + tar = archive.ArchiveTar("install.tar.lzma", "tarlzma") for finfo in files.list: orgname = arcname = join("install", finfo.path) if package.debug_package: orgname = join("debug", finfo.path) tar.add_to_archive(orgname, arcname.lstrip("install")) tar.close() - pkg.add_to_package("install.tar.7z") + pkg.add_to_package("install.tar.lzma") pkg.close() os.chdir(c) diff --git a/pisi/package.py b/pisi/package.py index 61371813..b232fb57 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -118,8 +118,8 @@ class Package: self.impl.unpack_dir(dir, outdir) def extract_install(self, outdir): - self.extract_file('install.tar.7z', ctx.config.tmp_dir()) - tar = archive.ArchiveTar(join(ctx.config.tmp_dir(), 'install.tar.7z'), 'tar7z') + self.extract_file('install.tar.lzma', ctx.config.tmp_dir()) + tar = archive.ArchiveTar(join(ctx.config.tmp_dir(), 'install.tar.lzma'), 'tarlzma') tar.unpack(outdir) def extract_dir_flat(self, dir, outdir):