summaryrefslogtreecommitdiff
path: root/openerp/addons/base/module
diff options
context:
space:
mode:
authorVo Minh Thu <vmt@openerp.com>2011-05-25 18:06:07 +0200
committerVo Minh Thu <vmt@openerp.com>2011-05-25 18:06:07 +0200
commit2f6dff76900a87221bd7c10bd761beffff4669bd (patch)
tree28e6ee319db178822ac651243e265168a41162c7 /openerp/addons/base/module
parent959ff88d646546e8e353bfb6467334df60dcac45 (diff)
parent16ac84af68d91b177394a2249f8b866e45ce3de3 (diff)
[MERGE] moved around some code (preparing for some refactoring) (large diff).
bzr revid: vmt@openerp.com-20110525160607-45pq13910rduijkk
Diffstat (limited to 'openerp/addons/base/module')
-rw-r--r--openerp/addons/base/module/module.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 5458771b49d..51fdb224918 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -30,7 +30,7 @@ import urllib
import zipfile
import zipimport
-import addons
+import openerp.modules as addons
import pooler
import release
import tools
@@ -79,8 +79,7 @@ class module(osv.osv):
info = {}
try:
info = addons.load_information_from_description_file(name)
- if 'version' in info:
- info['version'] = release.major_version + '.' + info['version']
+ info['version'] = release.major_version + '.' + info['version']
except Exception:
cls.__logger.debug('Error when trying to fetch informations for '
'module %s', name, exc_info=True)