[jhbuild] sysdeps new enough list now inc path systemmodule (GNOME bug 681886)



commit 17b78137b087382444b7aacbefaf7da437a35121
Author: Craig Keogh <cskeogh adam com au>
Date:   Thu Aug 16 10:17:54 2012 +0930

    sysdeps new enough list now inc path systemmodule (GNOME bug 681886)
    
    'jhbuild sysdeps' 'System installed packages which are new enough:' list
    now includes path systemmodules and c_include systemmodules.

 jhbuild/commands/sysdeps.py |    2 +-
 jhbuild/moduleset.py        |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/commands/sysdeps.py b/jhbuild/commands/sysdeps.py
index b3fc450..5b38d79 100644
--- a/jhbuild/commands/sysdeps.py
+++ b/jhbuild/commands/sysdeps.py
@@ -114,7 +114,7 @@ class cmd_sysdeps(cmd_build):
 
             print _('  No matching system package installed:')
             for module,(req_version, installed_version, new_enough, systemmodule) in module_state.iteritems():
-                if installed_version is None and (not systemmodule):
+                if installed_version is None and (not new_enough) and (not systemmodule):
                     print (_("    %(module)s (%(pkg_config)srequired=%(req)s)") % \
                            {'module'     : module.name,
                             'pkg_config' : fmt_pkg_config(module.pkg_config),
diff --git a/jhbuild/moduleset.py b/jhbuild/moduleset.py
index eb69472..5c4ea04 100644
--- a/jhbuild/moduleset.py
+++ b/jhbuild/moduleset.py
@@ -208,6 +208,8 @@ class ModuleSet:
                     new_enough = systeminstall.systemdependencies_met \
                                      (module.name, module.systemdependencies,
                                       self.config)
+                    if new_enough:
+                        installed_version = _('unknown')
                 module_state[module] = (required_version, installed_version,
                                         new_enough, systemmodule)
         return module_state



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