[jhbuild] moduleset: Only skip system dependencies if we haven't done a build before



commit 5e333b6ee4c1169902d06282bee2edd5e7fd1191
Author: Colin Walters <walters verbum org>
Date:   Mon Jul 18 13:48:55 2011 -0400

    moduleset: Only skip system dependencies if we haven't done a build before
    
    If we're in partial_build mode, we need to keep building a module if
    we've ever built it, even if the system dependency is now new enough.
    An example is where one is using jhbuild and has built dbus, but then
    one upgrades the distro, and a new enough system dbus comes in.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=654855

 jhbuild/moduleset.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/moduleset.py b/jhbuild/moduleset.py
index 5459dcd..781d805 100644
--- a/jhbuild/moduleset.py
+++ b/jhbuild/moduleset.py
@@ -142,7 +142,8 @@ class ModuleSet:
         if self.config.partial_build and process_sysdeps:
             system_module_state = self.get_system_modules(all_modules)
             for pkg_config,(module, req_version, installed_version, new_enough) in system_module_state.iteritems():
-                if new_enough:
+                # Only mark a module as processed if new enough *and* we haven't built it before
+                if new_enough and not self.packagedb.check(module.name):
                     self._state[module] = 'processed'
 
         if tags:



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