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

fix #5578

Browse Source 
- move apply_patches into unpack_source_archive function cause --unpack state means "unpack _and_ patch the source" so build functions only calls real steps
- run_check_action returns True if everything goes well and all set_state users checks that value
- apply_patches returns True if everything goes well and all callers checks that value
This commit is contained in:
S.Çağlar Onur
2007-05-01 23:52:36 +00:00
parent 3dc4a97abc
commit 5e4f1fc152
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/build.py
+7 -7
View File
@@ -191,9 +191,6 @@ class Builder:
self.fetch_source_archive() self.fetch_source_archive()
self.unpack_source_archive() self.unpack_source_archive()
# apply the patches and prepare a source directory for build.
self.apply_patches()
self.run_setup_action() self.run_setup_action()
self.run_build_action() self.run_build_action()
if ctx.get_option('debug') and not ctx.get_option('ignore_check'): if ctx.get_option('debug') and not ctx.get_option('ignore_check'):
@@ -310,18 +307,20 @@ class Builder:
def unpack_source_archive(self): def unpack_source_archive(self):
ctx.ui.info(_("Unpacking archive..."), noln = True) ctx.ui.info(_("Unpacking archive..."), noln = True)
self.sourceArchive.unpack() self.sourceArchive.unpack()
# apply the patches and prepare a source directory for build.
if self.apply_patches():
ctx.ui.info(_(" unpacked (%s)") % self.pkg_work_dir()) ctx.ui.info(_(" unpacked (%s)") % self.pkg_work_dir())
self.set_state("unpack") self.set_state("unpack")
def run_setup_action(self): def run_setup_action(self):
# Run configure, build and install phase # Run configure, build and install phase
ctx.ui.action(_("Setting up source...")) ctx.ui.action(_("Setting up source..."))
self.run_action_function(ctx.const.setup_func) if self.run_action_function(ctx.const.setup_func):
self.set_state("setupaction") self.set_state("setupaction")
def run_build_action(self): def run_build_action(self):
ctx.ui.action(_("Building source...")) ctx.ui.action(_("Building source..."))
self.run_action_function(ctx.const.build_func) if self.run_action_function(ctx.const.build_func):
self.set_state("buildaction") self.set_state("buildaction")
def run_check_action(self): def run_check_action(self):
@@ -336,7 +335,7 @@ class Builder:
pisi.util.clean_dir(self.pkg_install_dir()) pisi.util.clean_dir(self.pkg_install_dir())
# install function is mandatory! # install function is mandatory!
self.run_action_function(ctx.const.install_func, True) if self.run_action_function(ctx.const.install_func, True):
self.set_state("installaction") self.set_state("installaction")
def get_abandoned_files(self): def get_abandoned_files(self):
@@ -421,6 +420,7 @@ class Builder:
Error, _("unable to call function from actions: %s") %func Error, _("unable to call function from actions: %s") %func
os.chdir(curDir) os.chdir(curDir)
return True
def check_build_dependencies(self): def check_build_dependencies(self):
"""check and try to install build dependencies, otherwise fail.""" """check and try to install build dependencies, otherwise fail."""
@@ -495,6 +495,7 @@ class Builder:
ctx.ui.action(_("* Applying patch: %s") % patch.filename) ctx.ui.action(_("* Applying patch: %s") % patch.filename)
pisi.util.do_patch(self.srcDir, patchFile, level=patch.level) pisi.util.do_patch(self.srcDir, patchFile, level=patch.level)
return True
def generate_static_package_object(self): def generate_static_package_object(self):
ar_files = [] ar_files = []
@@ -939,7 +940,6 @@ def __buildState_unpack(pb, last):
if order[last] < order["fetch"]: if order[last] < order["fetch"]:
__buildState_fetch(pb) __buildState_fetch(pb)
pb.unpack_source_archive() pb.unpack_source_archive()
pb.apply_patches()
def __buildState_setupaction(pb, last): def __buildState_setupaction(pb, last):
if order[last] < order["unpack"]: if order[last] < order["unpack"]: