[jhbuild/external-deps] Alternative method for pulling in builddeps



commit fe91102bd7ee9899af396ad90a8ff6031a99ab6b
Author: John Carr <john carr unrouted co uk>
Date:   Fri Jun 5 08:23:53 2009 +0100

    Alternative method for pulling in builddeps
---
 jhbuild/commands/builddeps.py |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/jhbuild/commands/builddeps.py b/jhbuild/commands/builddeps.py
index bcc8b21..c87ed4b 100644
--- a/jhbuild/commands/builddeps.py
+++ b/jhbuild/commands/builddeps.py
@@ -49,10 +49,21 @@ class cmd_builddeps(Command):
         to_install = []
 
         modules = module_set.get_module_list(args or config.modules)
-        for module in modules:
+
+        asked_modules = (args or config.modules)[:]
+        for modname in asked_modules:
+            module = module_set.get_module(modname)
             min_version = module.get_minimum_version(modules)
+
             if pkgs.satisfiable(module, min_version) and not pkgs.satisfied(module, min_version):
                 to_install.append(pkgs.get_pkgname(module.name))
+            else:
+                for depmod in module.dependencies:
+                    if depmod not in asked_modules:
+                        asked_modules.append(depmod)
+                if not config.ignore_suggests:
+                    for depmod in module.suggests:
+                        asked_modules.append(depmod)
 
         if options.dryrun:
             print "Will install: %s" % " ".join(to_install)



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