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

build: Call pkg_src_dir() to get WorkDir path

Browse Source 
No need to keep a member for source directory.
This commit is contained in:
Fatih Aşıcı
2010-09-28 11:06:50 +00:00
parent 55d3fd2e62
commit b13b43f15c
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/operations/build.py
+9 -8
View File
@@ -229,7 +229,6 @@ class Builder:
self.actionLocals = None self.actionLocals = None
self.actionGlobals = None self.actionGlobals = None
self.srcDir = None
def set_spec_file(self, specuri): def set_spec_file(self, specuri):
if not specuri.is_remote_file(): if not specuri.is_remote_file():
@@ -446,7 +445,6 @@ class Builder:
def unpack_source_archives(self): def unpack_source_archives(self):
ctx.ui.info(_("Unpacking archive(s)...")) ctx.ui.info(_("Unpacking archive(s)..."))
self.sourceArchives.unpack() self.sourceArchives.unpack()
self.srcDir = self.pkg_src_dir()
# apply the patches and prepare a source directory for build. # apply the patches and prepare a source directory for build.
if self.apply_patches(): if self.apply_patches():
# Grab AdditionalFiles # Grab AdditionalFiles
@@ -522,7 +520,7 @@ class Builder:
# store additional files # store additional files
for afile in self.spec.source.additionalFiles: for afile in self.spec.source.additionalFiles:
src = os.path.join(self.specdir, ctx.const.files_dir, afile.filename) src = os.path.join(self.specdir, ctx.const.files_dir, afile.filename)
dest = os.path.join(self.srcDir, afile.target) dest = os.path.join(self.pkg_src_dir(), afile.target)
util.copy_file(src, dest) util.copy_file(src, dest)
if afile.permission: if afile.permission:
# mode is octal! # mode is octal!
@@ -616,11 +614,11 @@ class Builder:
# we'll need our working directory after actionscript # we'll need our working directory after actionscript
# finished its work in the archive source directory. # finished its work in the archive source directory.
curDir = os.getcwd() curDir = os.getcwd()
if os.path.exists(self.srcDir): src_dir = self.pkg_src_dir()
os.chdir(self.srcDir) if os.path.exists(src_dir):
os.chdir(src_dir)
else: else:
raise Error(_("ERROR: WorkDir (%s) does not exist\n") raise Error(_("ERROR: WorkDir (%s) does not exist\n") % src_dir)
% (self.srcDir))
if func in self.actionLocals: if func in self.actionLocals:
if ctx.get_option('ignore_sandbox') or \ if ctx.get_option('ignore_sandbox') or \
@@ -752,7 +750,10 @@ class Builder:
relativePath = relativePath.rsplit(".%s" % patch.compressionType, 1)[0] relativePath = relativePath.rsplit(".%s" % patch.compressionType, 1)[0]
ctx.ui.action(_("* Applying patch: %s") % patch.filename) ctx.ui.action(_("* Applying patch: %s") % patch.filename)
util.do_patch(self.srcDir, patchFile, level=patch.level, name=relativePath, reverse=reverseApply) util.do_patch(self.pkg_src_dir(), patchFile,
level=patch.level,
name=relativePath,
reverse=reverseApply)
return True return True
def generate_static_package_object(self): def generate_static_package_object(self):