[IMP] modify the condition to auto-install a module: at least one dependency must...

bzr revid: rco@openerp.com-20121211144010-3bbszb3ajxr3doup

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index cbd046a..bd977cd 100644 (file)
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -370,16 +370,20 @@ class module(osv.osv):
         # Mark the given modules to be installed.
         self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
 
-        # Mark (recursively) the newly satisfied modules to also be installed:
+        # Mark (recursively) the newly satisfied modules to also be installed
 
         # Select all auto-installable (but not yet installed) modules.
-        domain = [('state', '=', 'uninstalled'), ('auto_install', '=', True),]
+        domain = [('state', '=', 'uninstalled'), ('auto_install', '=', True)]
         uninstalled_ids = self.search(cr, uid, domain, context=context)
         uninstalled_modules = self.browse(cr, uid, uninstalled_ids, context=context)
 
-        # Keep those with all their dependencies satisfied.
+        # Keep those with:
+        #  - all dependencies satisfied (installed or to be installed),
+        #  - at least one dependency being 'to install'
+        satisfied_states = frozenset(('installed', 'to install', 'to upgrade'))
         def all_depencies_satisfied(m):
-            return all(x.state in ('to install', 'installed', 'to upgrade') for x in m.dependencies_id)
+            states = set(d.state for d in m.dependencies_id)
+            return (states <= satisfied_states) and ('to install' in states)
         to_install_modules = filter(all_depencies_satisfied, uninstalled_modules)
         to_install_ids = map(lambda m: m.id, to_install_modules)