summaryrefslogtreecommitdiff
path: root/openerp/addons/base/module/module.py
diff options
context:
space:
mode:
authorHarry (OpenERP) <hmo@tinyerp.com>2011-06-13 10:48:13 +0530
committerHarry (OpenERP) <hmo@tinyerp.com>2011-06-13 10:48:13 +0530
commite85f2d3c4a42e990fcce0317cdb2aead0082ddea (patch)
treeac8e867a332f29f7a60baee25dd03fdc85aaaa9d /openerp/addons/base/module/module.py
parent332d385390a48cd82670182c6b76e92bbf35397e (diff)
parentd042ae37503d79e240851a1cf6382984efd4a7fe (diff)
[MERGE] merged with trunk development branch
bzr revid: hmo@tinyerp.com-20110613051813-g11nroav1l93er22
Diffstat (limited to 'openerp/addons/base/module/module.py')
-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)