[Sugar-devel] [PATCH] Add dependencies on previous steps in bundlemodule.

Benjamin Berg benzea at sugarlabs.org
Thu Sep 23 10:55:11 EDT 2010


This patch fixes building bundles for me. Without it sugar-jhbuild directly
tries to install the module without first updating and building it.
And with a clean checkout that means it will fail, because the repository
has not even been downloaded at that point.
---
 sjhbuild/bundlemodule.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/sjhbuild/bundlemodule.py b/sjhbuild/bundlemodule.py
index c9a950d..7526e31 100644
--- a/sjhbuild/bundlemodule.py
+++ b/sjhbuild/bundlemodule.py
@@ -71,6 +71,7 @@ class BundleModule(Package):
         buildscript.execute(cmd, cwd=srcdir)
     do_build.next_phase = PHASE_INSTALL
     do_build.error_phases = [PHASE_FORCE_CHECKOUT]
+    do_build.depends = [PHASE_CHECKOUT]
 
     def skip_install(self, buildscript, last_state):
         return buildscript.config.nobuild
@@ -85,6 +86,7 @@ class BundleModule(Package):
         buildscript.packagedb.add(self.name, self.get_revision() or '')
     do_install.next_phase = Package.PHASE_DONE
     do_install.error_phases = []
+    do_install.depends = [PHASE_BUILD]
 
 
 def parse_bundle(node, config, uri, repositories, default_repo):
-- 
1.7.1



More information about the Sugar-devel mailing list