[jhbuild/jhdebuild: 526/536] [jhdebuild] Use PHASE_ instead of STATE_

[John Carr <johncarr src gnome org>]

commit a3650a2fe5d116b0d8438203729bc07bca449135
Author: John Carr <john carr unrouted co uk>
Date:   Sun May 17 16:58:12 2009 +0100

    [jhdebuild] Use PHASE_ instead of STATE_
---
 jhbuild/modtypes/autotools.py  |    4 ++--
 jhbuild/modtypes/debian.py     |   16 ++++++++--------
 jhbuild/modtypes/distutils.py  |    6 +++---
 jhbuild/modtypes/testmodule.py |   12 ++++++------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index b4a5cdc..3903401 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -86,7 +86,7 @@ class AutogenModule(Package, DebianBasePackage):
 
     def do_checkout(self, buildscript):
         self.checkout(buildscript)
-    do_checkout.error_phases = [STATE_FORCE_CHECKOUT]
+    do_checkout.error_phases = [PHASE_FORCE_CHECKOUT]
     do_deb_checkout = do_checkout
 
     def skip_force_checkout(self, buildscript, last_state):
@@ -261,7 +261,7 @@ class AutogenModule(Package, DebianBasePackage):
 
     def do_deb_build_package(self, buildscript):
         DebianBasePackage.do_deb_build_package(self, buildscript)
-    do_deb_build_package.error_phases = [DebianBasePackage.STATE_TAR_X, STATE_DIST]
+    do_deb_build_package.error_phases = [DebianBasePackage.PHASE_TAR_X, PHASE_DIST]
 
     def skip_install(self, buildscript, last_state):
         return buildscript.config.nobuild
diff --git a/jhbuild/modtypes/debian.py b/jhbuild/modtypes/debian.py
index 15e320e..fa7386e 100644
--- a/jhbuild/modtypes/debian.py
+++ b/jhbuild/modtypes/debian.py
@@ -10,11 +10,11 @@ from jhbuild.utils import debian
 
 class DebianBasePackage:
 
-    STATE_TAR_X          = 'tar_x'
-    STATE_DEBIAN_DIR     = 'debian_dir'
-    STATE_BUILD_PACKAGE  = 'build_package'
-    STATE_DINSTALL       = 'dinstall'
-    STATE_UPGRADE        = 'upgrade'
+    PHASE_TAR_X          = 'tar_x'
+    PHASE_DEBIAN_DIR     = 'debian_dir'
+    PHASE_BUILD_PACKAGE  = 'build_package'
+    PHASE_DINSTALL       = 'dinstall'
+    PHASE_UPGRADE        = 'upgrade'
 
     def skip_deb_tar_x(self, buildscript, last_state):
         if os.path.exists(self.get_tarball_dir(buildscript)):
@@ -97,7 +97,7 @@ class DebianBasePackage:
 
         os.chmod(os.path.join(builddebdir, distdir, 'debian', 'rules'), 0755)
     do_deb_debian_dir.error_phases = []
-    do_deb_debian_dir.depends = [STATE_TAR_X]
+    do_deb_debian_dir.depends = [PHASE_TAR_X]
 
     def skip_deb_build_package(self, buildscript, last_state):
         builddebdir = self.get_builddebdir(buildscript)
@@ -147,8 +147,8 @@ class DebianBasePackage:
 
         buildscript.execute(['dpkg-buildpackage','-rfakeroot', '-us', '-uc', '-D'],
                 cwd = builddebdir)
-    do_deb_build_package.error_phases = [STATE_DEBIAN_DIR]
-    do_deb_build_package.depends = [STATE_DEBIAN_DIR]
+    do_deb_build_package.error_phases = [PHASE_DEBIAN_DIR]
+    do_deb_build_package.depends = [PHASE_DEBIAN_DIR]
 
     def get_changes_file(self, buildscript):
         debian_name = self.get_debian_name(buildscript)
diff --git a/jhbuild/modtypes/distutils.py b/jhbuild/modtypes/distutils.py
index a756a2d..76f14e8 100644
--- a/jhbuild/modtypes/distutils.py
+++ b/jhbuild/modtypes/distutils.py
@@ -121,13 +121,13 @@ class DistutilsModule(Package):
         ext_recommended = [lax_int(x) for x in ext_dep.get('recommended').split('.')]
 
         if deb_available >= ext_recommended:
-            return (self.STATE_DONE, None, None)
+            return (self.PHASE_DONE, None, None)
 
         if deb_available >= ext_minimum:
             # XXX: warn it would be better to have a newer version
-            return (self.STATE_DONE, None, None)
+            return (self.PHASE_DONE, None, None)
 
-        return (self.STATE_DOWNLOAD, None, None)
+        return (self.PHASE_DOWNLOAD, None, None)
 
     
     def do_deb_build(self, buildscript):
diff --git a/jhbuild/modtypes/testmodule.py b/jhbuild/modtypes/testmodule.py
index 598586d..3f073af 100644
--- a/jhbuild/modtypes/testmodule.py
+++ b/jhbuild/modtypes/testmodule.py
@@ -34,9 +34,9 @@ __test_types__ = ['ldtp' , 'dogtail']
 class TestModule(Package):
     type = 'test'
     
-    STATE_CHECKOUT       = 'checkout'
-    STATE_FORCE_CHECKOUT = 'force_checkout'
-    STATE_TEST           = 'test'
+    PHASE_CHECKOUT       = 'checkout'
+    PHASE_FORCE_CHECKOUT = 'force_checkout'
+    PHASE_TEST           = 'test'
     
     def __init__(self, name, branch, test_type, dependencies=[], after=[], tested_pkgs=[]):
         Package.__init__(self, name)
@@ -60,12 +60,12 @@ class TestModule(Package):
 
     def do_checkout(self, buildscript):
         self.checkout(buildscript)
-    do_checkout.error_phases = [STATE_FORCE_CHECKOUT]
+    do_checkout.error_phases = [PHASE_FORCE_CHECKOUT]
         
     def do_force_checkout(self, buildscript):
         buildscript.set_action('Checking out', self)
         self.branch.force_checkout(buildscript)
-    do_force_checkout.error_phases = [STATE_FORCE_CHECKOUT]
+    do_force_checkout.error_phases = [PHASE_FORCE_CHECKOUT]
 
     def _get_display(self):
         # get free display
@@ -125,7 +125,7 @@ class TestModule(Package):
                     os.environ['XAUTHORITY'] = old_xauth
                 else:
                     os.unsetenv('XAUTHORITY')
-    do_test.depends = [STATE_CHECKOUT]
+    do_test.depends = [PHASE_CHECKOUT]
 
     def get_ldtp_log_file(self, filename):
         # <ldtp>