[jhbuild] terminal: Clean trycheckout status when picking up a new module



commit be65f005a16069d625c9be6dc0e2f859eac3e241
Author: Emanuele Aina <emanuele aina collabora com>
Date:   Mon Jan 27 11:03:12 2014 +0100

    terminal: Clean trycheckout status when picking up a new module
    
    If two consecutive modules were to fail with trycheckout enabled,
    jhbuild would get quite confused as the last tried recovery phase didn't
    get reset properly.
    
    This would cause jhbuild to go straight to eg. the force_checkout phase
    if the previous module built by forcing the configure phase, or bail out
    completely if the previous module failed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=723082

 jhbuild/frontends/terminal.py |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/jhbuild/frontends/terminal.py b/jhbuild/frontends/terminal.py
index 201cfba..0b77cba 100644
--- a/jhbuild/frontends/terminal.py
+++ b/jhbuild/frontends/terminal.py
@@ -263,6 +263,9 @@ class TerminalBuildScript(buildscript.BuildScript):
             raise CommandError(_('########## Error running %s')
                                % print_args['command'])
 
+    def start_module(self, module):
+        self.triedcheckout = None
+
     def start_phase(self, module, phase):
         self.notify.clear()
         self.trayicon.set_icon(os.path.join(icondir,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]