From 1226f3dabfef23217d6052b42e18eb7340f5a7f4 Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Tue, 25 Dec 2012 17:21:41 +0000 Subject: Remove skipping of modules This logic is too aggressive and too fragile at the same time. --- diff --git a/devbot/build.py b/devbot/build.py index 485d5bb..640ba01 100644 --- a/devbot/build.py +++ b/devbot/build.py @@ -48,25 +48,10 @@ def build(): _ccache_reset() - modules = config.load_modules() - skipped = [] - - for module in modules[:]: + for module in config.load_modules(): if state.built_module_is_unchanged(module): - modules.pop(0) - skipped.append(module.name) - else: - break - - if skipped: - print "\n* Skipping unchanged modules *\n" - print "\n".join(skipped) - - for module in modules: - state.built_module_remove(module) - - for module in modules: - if not _build_module(module, config.get_log_path("build")): + print "\n* Skipping unchanged module %s *" % module.name + elif not _build_module(module, config.get_log_path("build")): return False _ccache_print_stats() diff --git a/devbot/state.py b/devbot/state.py index 83bbe9a..3cb3e42 100644 --- a/devbot/state.py +++ b/devbot/state.py @@ -53,13 +53,6 @@ def built_module_touch(module): _save_state(_BUILT_MODULES, built_modules) -def built_module_remove(module): - built_modules = _load_state(_BUILT_MODULES) - - if built_modules and module.name in built_modules: - del built_modules[module.name] - _save_state(_BUILT_MODULES, built_modules) - def built_module_is_unchanged(module): git_module = module.get_git_module() built_modules = _load_state(_BUILT_MODULES, {}) -- cgit v0.9.1