From 689517088b42031351f5fa4087160b49a655b951 Mon Sep 17 00:00:00 2001
From: Bernie Innocenti <bernie@codewiz.org>
Date: Sat, 16 May 2009 13:47:02 +0000
Subject: Rename STATE_* to PHASE_* to match upstream change

---
diff --git a/sjhbuild/bundlemodule.py b/sjhbuild/bundlemodule.py
index 3a662c1..16b36cc 100644
--- a/sjhbuild/bundlemodule.py
+++ b/sjhbuild/bundlemodule.py
@@ -10,10 +10,10 @@ __all__ = [ 'BundleModule' ]
 class BundleModule(Package):
     type = 'bundle'
 
-    STATE_CHECKOUT = 'checkout'
-    STATE_FORCE_CHECKOUT = 'force_checkout'
-    STATE_BUILD = 'build'
-    STATE_INSTALL = 'install'
+    PHASE_CHECKOUT = 'checkout'
+    PHASE_FORCE_CHECKOUT = 'force_checkout'
+    PHASE_BUILD = 'build'
+    PHASE_INSTALL = 'install'
 
     def __init__(self, name, branch, dependencies=[], after=[]):
         Package.__init__(self, name, dependencies, after)
@@ -30,8 +30,8 @@ class BundleModule(Package):
 
     def do_start(self, buildscript):
         pass
-    do_start.next_state = STATE_CHECKOUT
-    do_start.error_states = []
+    do_start.next_phase = PHASE_CHECKOUT
+    do_start.error_phases = []
 
     def skip_checkout(self, buildscript, last_state):
         # skip the checkout stage if the nonetwork flag is set
@@ -45,8 +45,8 @@ class BundleModule(Package):
         if not os.path.exists(srcdir):
             raise BuildStateError('source directory %s was not created'
                                   % srcdir)
-    do_checkout.next_state = STATE_BUILD
-    do_checkout.error_states = [STATE_FORCE_CHECKOUT]
+    do_checkout.next_phase = PHASE_BUILD
+    do_checkout.error_phases = [PHASE_FORCE_CHECKOUT]
 
     def skip_force_checkout(self, buildscript, last_state):
         return False
@@ -54,8 +54,8 @@ class BundleModule(Package):
     def do_force_checkout(self, buildscript):
         buildscript.set_action('Checking out', self)
         self.branch.force_checkout(buildscript)
-    do_force_checkout.next_state = STATE_BUILD
-    do_force_checkout.error_states = [STATE_FORCE_CHECKOUT]
+    do_force_checkout.next_phase = PHASE_BUILD
+    do_force_checkout.error_phases = [PHASE_FORCE_CHECKOUT]
 
     def skip_build(self, buildscript, last_state):
         return buildscript.config.nobuild
@@ -67,8 +67,8 @@ class BundleModule(Package):
         python = os.environ.get('PYTHON', 'python')
         cmd = [python, 'setup.py', 'build']
         buildscript.execute(cmd, cwd=srcdir)
-    do_build.next_state = STATE_INSTALL
-    do_build.error_states = [STATE_FORCE_CHECKOUT]
+    do_build.next_phase = PHASE_INSTALL
+    do_build.error_phases = [PHASE_FORCE_CHECKOUT]
 
     def skip_install(self, buildscript, last_state):
         return buildscript.config.nobuild
@@ -82,8 +82,8 @@ class BundleModule(Package):
         cmd.extend(['--prefix', buildscript.config.prefix])
         buildscript.execute(cmd, cwd=srcdir)
         buildscript.packagedb.add(self.name, self.get_revision() or '')
-    do_install.next_state = Package.STATE_DONE
-    do_install.error_states = []
+    do_install.next_phase = Package.PHASE_DONE
+    do_install.error_phases = []
 
 
 def parse_bundle(node, config, uri, repositories, default_repo):
--
cgit v0.9.1