[jhbuild: 15/27] Merge branch 'master' into dependency-based-build-steps

[Frederic Peters <fpeters src gnome org>]

commit b41bf59e7bb736dd628452ce7854409fc7741f65
Merge: 4b8a5e1... d7969ab...
Author: Frederic Peters <fpeters 0d be>
Date:   Wed May 6 20:28:51 2009 +0200

    Merge branch 'master' into dependency-based-build-steps
    
    Conflicts:
    	jhbuild/frontends/terminal.py

 buildbot/public_html/lgo.css                 |   16 ++++++++-
 buildbot/public_html/top-header-gradient.png |  Bin 0 -> 725 bytes
 buildbot/template.html                       |    4 ++-
 doc/C/jhbuild.xml                            |    9 +++--
 jhbuild/buildbot/factory.py                  |   15 +++++---
 jhbuild/buildbot/status/web/__init__.py      |   23 +++++++++----
 jhbuild/buildbot/status/web/changes.py       |    2 +-
 jhbuild/commands/bot.py                      |   47 ++++++++++++++++----------
 jhbuild/commands/info.py                     |    6 ---
 jhbuild/frontends/terminal.py                |   16 ++++++---
 jhbuild/frontends/tinderbox.py               |   17 ++++++---
 modulesets/gnome-external-deps-2.28.modules  |   36 +++----------------
 modulesets/gnome-suites-2.26.modules         |    2 +-
 modulesets/gnome-suites-2.28.modules         |    3 +-
 14 files changed, 109 insertions(+), 87 deletions(-)

diff --cc jhbuild/frontends/terminal.py
index 433f6e0,8cfa266..dc896e2
--- a/jhbuild/frontends/terminal.py
+++ b/jhbuild/frontends/terminal.py
@@@ -260,10 -260,17 +260,16 @@@ class TerminalBuildScript(buildscript.B
          self.notify.notify(summary = summary, body = error_message,
                  icon = 'dialog-error', expire = 20)
  
-         if self.config.trycheckout and (not self.triedcheckout) and altphases.count('force_checkout'):
-             self.triedcheckout = True
-             return 'force_checkout'
-         self.triedcheckout = False
+         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'
+         self.triedcheckout = None
  
          if not self.config.interact:
              return 'fail'
diff --cc jhbuild/frontends/tinderbox.py
index 395e6c1,67e1a59..dde003a
--- a/jhbuild/frontends/tinderbox.py
+++ b/jhbuild/frontends/tinderbox.py
@@@ -327,25 -327,32 +327,32 @@@ class TinderboxBuildScript(buildscript.
          self.indexfp.write('</tr>\n\n')
          self.indexfp.flush()
  
 -    def start_phase(self, module, state):
 -        self.modulefp.write('<a name="%s"></a>\n' % state)
 -    def end_phase(self, module, state, error):
 +    def start_phase(self, module, phase):
 +        self.modulefp.write('<a name="%s"></a>\n' % phase)
 +    def end_phase(self, module, phase, error):
          if error:
              self.indexfp.write('<a class="failure" title="%s" href="%s#%s">%s</a>\n'
 -                               % (error, self.modulefilename, state, state))
 +                               % (error, self.modulefilename, phase, phase))
          else:
              self.indexfp.write('<a class="success" href="%s#%s">%s</a>\n'
 -                               % (self.modulefilename, state, state))
 +                               % (self.modulefilename, phase, phase))
          self.indexfp.flush()
  
 -    def handle_error(self, module, state, nextstate, error, altstates):
 +    def handle_error(self, module, phase, nextphase, error, altphases):
          '''handle error during build'''
 -        self.message('error during stage %s of %s: %s' % (state, module.name,
 +        self.message('error during stage %s of %s: %s' % (phase, module.name,
                                                            error))
-         if self.config.trycheckout and (not self.triedcheckout):
-             self.triedcheckout = True
-             return 'force_checkout'
-         self.triedcheckout = False
+         if self.config.trycheckout:
+             if self.triedcheckout is None and \
+                     state not in ('checkout', 'configure'):
+                 self.triedcheckout = 'configure'
+                 self.message(_('automatically retrying configure'))
+                 return 'configure'
+             elif self.triedcheckout == 'configure':
+                 self.triedcheckout = 'done'
+                 self.message(_('automatically forcing a fresh checkout'))
+                 return 'force_checkout'
+         self.triedcheckout = None
  
          if self.modulefp:
              self.modulefp.write('<div class="note">The Gnome Live! website may'