[jhbuild] Remove warnings to run bootstrap (GNOME bug 656818)

[Craig Keogh <cskeogh src gnome org>]

commit 20d7a75d32b25b4a8908ef697aa987d8f5edec6a
Author: Craig Keogh <cskeogh adam com au>
Date:   Thu Apr 5 14:09:46 2012 +0930

    Remove warnings to run bootstrap (GNOME bug 656818)

 jhbuild/commands/base.py      |   56 -----------------------------------------
 jhbuild/commands/bootstrap.py |    7 +---
 2 files changed, 2 insertions(+), 61 deletions(-)
---
diff --git a/jhbuild/commands/base.py b/jhbuild/commands/base.py
index bf8e4b7..562da41 100644
--- a/jhbuild/commands/base.py
+++ b/jhbuild/commands/base.py
@@ -151,56 +151,6 @@ class cmd_cleanone(Command):
 register_command(cmd_cleanone)
 
 
-def check_bootstrap_updateness(config):
-    '''Check install date of bootstrap modules, and compare them to
-       the bootstrap moduleset file last modification date.
-    '''
-    try:
-        module_set = jhbuild.moduleset.load(config, uri = 'bootstrap')
-    except:
-        # failed to get bootstrap moduleset, silently ignore.
-        return
-    packagedb = module_set.packagedb
-
-    max_install_date = max([
-            packagedb.installdate(module.name)
-            for module in module_set.modules.values()])
-
-    if max_install_date is None:
-        # bootstrap module has never been built; probably the user doesn't want
-        # to use it
-        return
-
-    updated_modules = []
-    for module in module_set.modules.values():
-        pkg = packagedb.get(module.name)
-        if pkg is None:
-            continue
-        p_version = pkg.version
-        if p_version != module.get_revision():
-            updated_modules.append(module.name)
-
-    if not config.modulesets_dir:
-        return
-    bootstrap_uri = os.path.join(config.modulesets_dir, 'bootstrap.modules')
-    if not os.path.exists(bootstrap_uri):
-        return
-    bootstrap_mtime = os.stat(bootstrap_uri)[stat.ST_MTIME]
-
-    if max_install_date <= bootstrap_mtime:
-        # general note, to cover added modules
-        logging.info(
-                _('bootstrap moduleset has been updated since the last time '\
-                  'you used it, perhaps you should run jhbuild bootstrap.'))
-
-    if updated_modules:
-        # note about updated modules
-        logging.info(
-                _('some bootstrap modules have been updated, '\
-                  'perhaps you should update them: %s.') % \
-                  ', '.join(updated_modules))
-
-
 class cmd_build(Command):
     doc = N_('Update and compile all modules (the default)')
 
@@ -268,9 +218,6 @@ class cmd_build(Command):
     def run(self, config, options, args, help=None):
         config.set_from_cmdline_options(options)
 
-        if not config.quiet_mode:
-            check_bootstrap_updateness(config)
-
         module_set = jhbuild.moduleset.load(config)
         modules = args or config.modules
         module_list = module_set.get_module_list(modules,
@@ -341,9 +288,6 @@ class cmd_buildone(Command):
     def run(self, config, options, args, help=None):
         config.set_from_cmdline_options(options)
 
-        if not config.quiet_mode:
-            check_bootstrap_updateness(config)
-
         module_set = jhbuild.moduleset.load(config)
         module_list = []
         for modname in args:
diff --git a/jhbuild/commands/bootstrap.py b/jhbuild/commands/bootstrap.py
index 667667a..82724a2 100644
--- a/jhbuild/commands/bootstrap.py
+++ b/jhbuild/commands/bootstrap.py
@@ -1,7 +1,7 @@
 # jhbuild - a tool to ease building collections of source packages
 # Copyright (C) 2001-2006  James Henstridge
 #
-#   bootstrap.py: code to check whether prerequisite modules are installed
+#   bootstrap.py: The bootstrap command installs a set of build utilities
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ from jhbuild.commands.base import cmd_build
 from jhbuild.utils.cmds import check_version
 
 class cmd_bootstrap(cmd_build):
-    doc = N_('Build required support tools')
+    doc = N_('Build support tools')
 
     name = 'bootstrap'
 
@@ -75,9 +75,6 @@ class cmd_bootstrap(cmd_build):
             os.environ['PATH'] = path
             config.skip.extend(ignored_modules)
 
-        # cancel the bootstrap updateness check as it has no sense (it *is*
-        # running bootstrap right now)
-        jhbuild.commands.base.check_bootstrap_updateness = lambda x: x
         rc = cmd_build.run(self, config, options, args)
 
         if ignored_modules: