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

package: Add tmp_dir parameter to constructor

Browse Source 
Different operations might use different temp dirs.
This commit is contained in:
Fatih Aşıcı
2010-06-21 09:09:08 +00:00
parent bfb3244548
commit 7435294ad7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/operations/build.py
+3 -1
View File
@@ -1084,7 +1084,9 @@ class Builder:
ctx.ui.info(_("Creating PiSi package %s.") % name) ctx.ui.info(_("Creating PiSi package %s.") % name)
pkg = pisi.package.Package(name, "w", self.target_package_format) pkg = pisi.package.Package(name, "w",
format=self.target_package_format,
tmp_dir=self.pkg_dir())
# add comar files to package # add comar files to package
os.chdir(self.specdir) os.chdir(self.specdir)
pisi/package.py
+4 -6
View File
@@ -54,7 +54,7 @@ class Package:
archive_name = ctx.const.install_tar + archive_suffix archive_name = ctx.const.install_tar + archive_suffix
return archive_name, archive_format return archive_name, archive_format
def __init__(self, packagefn, mode='r', format=None): def __init__(self, packagefn, mode='r', format=None, tmp_dir=None):
self.filepath = packagefn self.filepath = packagefn
url = pisi.uri.URI(packagefn) url = pisi.uri.URI(packagefn)
@@ -83,6 +83,8 @@ class Package:
if self.format not in Package.formats: if self.format not in Package.formats:
raise Error(_("Unsupported package format: %s") % format) raise Error(_("Unsupported package format: %s") % format)
self.tmp_dir = tmp_dir or ctx.config.tmp_dir()
def fetch_remote_file(self, url): def fetch_remote_file(self, url):
dest = ctx.config.cached_packages_dir() dest = ctx.config.cached_packages_dir()
self.filepath = os.path.join(dest, url.filename()) self.filepath = os.path.join(dest, url.filename())
@@ -117,11 +119,7 @@ class Package:
if self.install_archive is None: if self.install_archive is None:
archive_name, archive_format = \ archive_name, archive_format = \
self.archive_name_and_format(self.format) self.archive_name_and_format(self.format)
pkg_dir = "-".join((self.metadata.package.name, self.install_archive_path = util.join_path(self.tmp_dir,
self.metadata.package.version,
self.metadata.package.release))
self.install_archive_path = util.join_path(ctx.config.tmp_dir(),
pkg_dir,
archive_name) archive_name)
ctx.build_leftover = self.install_archive_path ctx.build_leftover = self.install_archive_path
self.install_archive = archive.ArchiveTar( self.install_archive = archive.ArchiveTar(