[jhbuild/desrt/master: 10/13] fix after stuff

[Ryan Lortie <desrt src gnome org>]

commit 71e338edf65681cc92eb94f8e108f08fdf863dfa
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Jan 21 21:59:43 2015 -0500

    fix after stuff

 jhbuild/commands/base.py |   16 +++-------------
 jhbuild/moduleset.py     |   15 +++++++++------
 2 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/jhbuild/commands/base.py b/jhbuild/commands/base.py
index 9259353..df745f7 100644
--- a/jhbuild/commands/base.py
+++ b/jhbuild/commands/base.py
@@ -62,10 +62,7 @@ class cmd_update(Command):
     def run(self, config, options, args, help=None):
         config.set_from_cmdline_options(options)
         module_set = jhbuild.moduleset.load(config)
-        module_list = module_set.get_module_list(args or config.modules,
-                config.skip, tags=config.tags,
-                include_suggests=not config.ignore_suggests,
-                include_afters=not config.ignore_after)
+        module_list = module_set.get_module_list(args or config.modules, config.skip, tags=config.tags)
         # remove modules up to startat
         if options.startat:
             while module_list and module_list[0].name != options.startat:
@@ -232,10 +229,7 @@ class cmd_build(BuildCommand):
 
         module_set = jhbuild.moduleset.load(config)
         modules = args or config.modules
-        full_module_list = module_set.get_full_module_list \
-                               (modules, config.skip,
-                                include_suggests=not config.ignore_suggests,
-                                include_afters=not config.ignore_after)
+        full_module_list = module_set.get_full_module_list (modules, config.skip)
         full_module_list = module_set.remove_tag_modules(full_module_list,
                                                          config.tags)
         module_list = module_set.remove_system_modules(full_module_list)
@@ -459,11 +453,7 @@ class cmd_list(Command):
         if options.list_all_modules:
             module_list = module_set.modules.values()
         else:
-            module_list = module_set.get_module_list \
-                              (args or config.modules, config.skip,
-                               tags=config.tags,
-                               include_suggests= not config.ignore_suggests,
-                               include_afters=not config.ignore_after)
+            module_list = module_set.get_module_list (args or config.modules, config.skip, tags=config.tags)
 
         # remove modules up to startat
         if options.startat:
diff --git a/jhbuild/moduleset.py b/jhbuild/moduleset.py
index 0b22a9a..f74ff2e 100644
--- a/jhbuild/moduleset.py
+++ b/jhbuild/moduleset.py
@@ -97,17 +97,14 @@ class ModuleSet:
                 return self.modules[module]
         raise KeyError(module_name)
 
-    def get_module_list(self, module_names, skip=[], tags=[],
-                        include_suggests=True, include_afters=True):
-        module_list = self.get_full_module_list(module_names, skip,
-                                                include_suggests,
-                                                include_afters)
+    def get_module_list(self, module_names, skip=[], tags=[], include_suggests=None, include_afters=None):
+        module_list = self.get_full_module_list(module_names, skip, include_suggests, include_afters)
         module_list = self.remove_system_modules(module_list)
         module_list = self.remove_tag_modules(module_list, tags)
         return module_list
 
     def get_full_module_list(self, module_names='all', skip=[],
-                                include_suggests=True, include_afters=True,
+                                include_suggests=None, include_afters=None,
                                 warn_about_circular_dependencies=True):
 
         def add_module(to_build, name, seen = []):
@@ -174,6 +171,12 @@ class ModuleSet:
 
             return True
 
+        if include_afters is None:
+            include_afters = not self.config.ignore_after
+
+        if include_suggests is None:
+            include_suggests = not self.config.ignore_suggests
+
         if module_names == 'all':
             module_names = self.modules.keys()