[jhbuild] Fix 'jhbuild tinderbox -C' (GNOME bug 645296)

[Craig Keogh <cskeogh src gnome org>]

commit 687b76d2596f43f21fa7636c7c437b040212d13d
Author: Craig Keogh <cskeogh adam com au>
Date:   Tue Mar 22 21:59:33 2011 +1030

    Fix 'jhbuild tinderbox -C' (GNOME bug 645296)
    
    Based upon analysis by Enrico Minack

 jhbuild/frontends/tinderbox.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/jhbuild/frontends/tinderbox.py b/jhbuild/frontends/tinderbox.py
index 989ead2..d278b86 100644
--- a/jhbuild/frontends/tinderbox.py
+++ b/jhbuild/frontends/tinderbox.py
@@ -344,12 +344,12 @@ class TinderboxBuildScript(buildscript.BuildScript):
         self.message('error during stage %s of %s: %s' % (phase, module.name,
                                                           error))
         if self.config.trycheckout:
-            if self.triedcheckout is None and \
-                    state not in ('checkout', 'configure'):
+            if self.triedcheckout is None and altphases.count('configure'):
                 self.triedcheckout = 'configure'
                 self.message(_('automatically retrying configure'))
                 return 'configure'
-            elif self.triedcheckout == 'configure':
+            elif self.triedcheckout == 'configure' and \
+            altphases.count('force_checkout'):
                 self.triedcheckout = 'done'
                 self.message(_('automatically forcing a fresh checkout'))
                 return 'force_checkout'