From e85e69dffd48a7573769cf5c7dfa7e2d9b6f9d43 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 11 Dec 2008 15:53:05 +0100 Subject: [PATCH 1/2] [IMP] osutil.listdir follow symlinks bzr revid: christophe@tinyerp.com-20081211145305-9vf5k996rcaueat4 --- bin/tools/osutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tools/osutil.py b/bin/tools/osutil.py index ba1d650f4ef..1925f82f671 100644 --- a/bin/tools/osutil.py +++ b/bin/tools/osutil.py @@ -34,7 +34,7 @@ def listdir(dir, recursive=False): return os.listdir(dir) res = [] - for root, dirs, files in os.walk(dir): + for root, dirs, files in walksymlinks(dir): root = root[len(dir)+1:] res.extend([opj(root, f) for f in files]) return res From 5e510fc9775ca75bd316b8d08319e6f57617cc0a Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 11 Dec 2008 15:54:20 +0100 Subject: [PATCH 2/2] [FIX] upgrade a module now install the new dependencies bzr revid: christophe@tinyerp.com-20081211145420-2dy5ym0mo8s0bsex --- bin/addons/base/module/module.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py index 26570685f43..5ed36511d95 100644 --- a/bin/addons/base/module/module.py +++ b/bin/addons/base/module/module.py @@ -259,7 +259,10 @@ class module(osv.osv): for dep in depobj.browse(cr, uid, iids, context=context): if dep.module_id.state=='installed': todo.append(dep.module_id) - self.write(cr,uid, map(lambda x: x.id, todo), {'state':'to upgrade'}, context=context) + + ids = map(lambda x: x.id, todo) + self.write(cr, uid, ids, {'state':'to upgrade'}, context=context) + self.button_install(cr, uid, ids, context=context) return True def button_upgrade_cancel(self, cr, uid, ids, context={}):