Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.lzma, install.tar, install.tar.lzma strings to constants.

Browse Source
This commit is contained in:
Faik Uygur
2006-06-02 20:45:47 +00:00
parent 1442e9ecdc
commit 76e1f27bf1
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/archive.py
+5 -4
View File
@@ -91,8 +91,9 @@ class ArchiveTar(ArchiveBase):
rmode = 'r:bz2'
elif self.type == 'tarlzma':
rmode = 'r:'
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))
self.file_path = self.file_path.rstrip(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:
#FIXME: see bug #2836
raise LZMAError(out)
@@ -103,7 +104,7 @@ class ArchiveTar(ArchiveBase):
oldwd = os.getcwd()
os.chdir(target_dir)
install_tar_path = util.join_path(ctx.config.tmp_dir(), "install.tar")
install_tar_path = util.join_path(ctx.config.tmp_dir(), ctx.const.install_tar)
for tarinfo in self.tar:
# Installing packages (especially shared libraries) is a
# bit tricky. You should also change the inode if you
@@ -137,7 +138,7 @@ class ArchiveTar(ArchiveBase):
wmode = 'w:bz2'
elif self.type == 'tarlzma':
wmode = 'w:'
self.file_path = self.file_path.rstrip('.lzma')
self.file_path = self.file_path.rstrip(ctx.const.lzma_suffix)
else:
raise ArchiveError(_("Archive type not recognized"))
self.tar = tarfile.open(self.file_path, wmode)
pisi/build.py
+4 -4
View File
@@ -814,17 +814,17 @@ class Builder:
pkg.add_to_package(orgname, arcname)
pkg.close()
else: # default package format is 1.1, so make it fallback.
ctx.build_leftover = join(self.pkg_dir(), "install.tar.lzma")
tar = archive.ArchiveTar("install.tar.lzma", "tarlzma")
ctx.build_leftover = join(self.pkg_dir(), ctx.const.install_tar_lzma)
tar = archive.ArchiveTar(ctx.const.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.lzma")
pkg.add_to_package(ctx.const.install_tar_lzma)
pkg.close()
os.unlink("install.tar.lzma")
os.unlink(ctx.const.install_tar_lzma)
ctx.build_leftover = None
os.chdir(c)
pisi/constants.py
+5
View File
@@ -49,6 +49,9 @@ class Constants:
self.__c.package_suffix = ".pisi"
self.__c.xdelta_suffix = ".xdelta"
# suffix for lzma
self.__c.lzma_suffix = ".lzma"
# suffix for auto generated debug packages
self.__c.debug_name_suffix = "-debug"
self.__c.debug_file_suffix = ".debug"
@@ -74,6 +77,8 @@ class Constants:
self.__c.comar_dir = "comar"
self.__c.files_xml = "files.xml"
self.__c.metadata_xml = "metadata.xml"
self.__c.install_tar = "install.tar"
self.__c.install_tar_lzma = "install.tar.lzma"
# functions in actions_file
self.__c.setup_func = "setup"
pisi/package.py
+3 -3
View File
@@ -118,9 +118,9 @@ class Package:
self.impl.unpack_dir(dir, outdir)
def extract_install(self, outdir):
if self.impl.has_file('install.tar.lzma'):
self.extract_file('install.tar.lzma', ctx.config.tmp_dir())
tar = archive.ArchiveTar(join(ctx.config.tmp_dir(), 'install.tar.lzma'), 'tarlzma')
if self.impl.has_file(ctx.const.install_tar_lzma):
self.extract_file(ctx.const.install_tar_lzma, ctx.config.tmp_dir())
tar = archive.ArchiveTar(join(ctx.config.tmp_dir(), ctx.const.install_tar_lzma), 'tarlzma')
tar.unpack_dir(outdir)
else:
self.extract_dir_flat('install', outdir)