diff options
| author | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:41:40 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:41:40 +0100 |
| commit | ab386c0f5faca687d2c5bf9bf61da5fa8b68a70e (patch) | |
| tree | dfc4684c7a0d5e6e66f7f3d0c606f9400035da25 /openerpcommand | |
| parent | bb1e256f5b24bb4fc4b64e1fa973f86a30e4bace (diff) | |
| parent | 3211a29d9b79f4809e77cb072f8a23ab26fec460 (diff) | |
[MERGE] forward port of branch saas-2 up to revid 4984 chs@openerp.com-20131125151017-lmj53bxg1pfrr4a7
bzr revid: chs@openerp.com-20131125154140-cpbk4tcdml2a3b9n
Diffstat (limited to 'openerpcommand')
| -rw-r--r-- | openerpcommand/common.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/openerpcommand/common.py b/openerpcommand/common.py index f306d7f4b2d..9209f8e1eb6 100644 --- a/openerpcommand/common.py +++ b/openerpcommand/common.py @@ -40,8 +40,7 @@ def get_addons_from_paths(paths, exclude): module_names = [] for p in paths: if os.path.exists(p): - names = list(set(os.listdir(p))) - names = filter(lambda a: not (a.startswith('.') or a in exclude), names) + names = [n for n in os.listdir(p) if os.path.isfile(os.path.join(p, n, '__openerp__.py')) and not n.startswith('.') and n not in exclude] names = filter(lambda a: os.path.isdir(os.path.join(p, a)), names) names = filter(lambda a: os.path.exists(os.path.join(p, a, '__openerp__.py')), names) module_names.extend(names) |