From 49c441b3a494fe561573d9c3e3fdc0856b294c4f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Tue, 2 Dec 2008 17:47:26 +0100
Subject: [PATCH] [IMP] move parse_version to tools directory [IMP] release.py
 set major_version variable

bzr revid: christophe@tinyerp.com-20081202164726-0d9d0gz89d6y7v2l
---
 bin/addons/base/module/module.py                   | 9 ++++-----
 bin/release.py                                     | 1 +
 bin/tools/convert.py                               | 2 +-
 bin/tools/misc.py                                  | 2 +-
 bin/{addons/base/module => tools}/parse_version.py | 0
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename bin/{addons/base/module => tools}/parse_version.py (100%)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 71005bcec34..32519086e77 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -35,7 +35,7 @@ import addons
 import pooler
 import netsvc
 
-from parse_version import parse_version
+from tools.parse_version import parse_version
 
 class module_repository(osv.osv):
     _name = "ir.module.repository"
@@ -53,7 +53,7 @@ class module_repository(osv.osv):
     }
     _defaults = {
         'sequence': lambda *a: 5,
-        'filter': lambda *a: 'href="([a-zA-Z0-9_]+)-('+release.version.rsplit('.', 1)[0]+'.(\\d+)((\\.\\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\\d*)*)(-r(\\d+))?)(\.zip)"',
+        'filter': lambda *a: 'href="([a-zA-Z0-9_]+)-('+release.major_version+'.(\\d+)((\\.\\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\\d*)*)(-r(\\d+))?)(\.zip)"',
         'active': lambda *a: 1,
     }
     _order = "sequence"
@@ -91,7 +91,7 @@ class module(osv.osv):
             data = f.read()
             info = eval(data)
             if 'version' in info:
-                info['version'] = release.version.rsplit('.', 1)[0] + '.' + info['version']
+                info['version'] = release.major_version + '.' + info['version']
             f.close()
         except:
             return {}
@@ -326,8 +326,7 @@ class module(osv.osv):
 
                 if not os.path.isfile( mod_path ):
                     import imp
-                    # XXX must restrict to only addons paths
-                    path = imp.find_module(mod_name)
+                    path = imp.find_module(mod_name, [addons.ad, addons._ad])
                     imp.load_module(name, *path)
                 else:
                     import zipimport
diff --git a/bin/release.py b/bin/release.py
index 0a256895bb2..0930f6214aa 100644
--- a/bin/release.py
+++ b/bin/release.py
@@ -23,6 +23,7 @@
 
 name = 'openerp-server'
 version = '5.0.0-rc1'
+major_version = version.rsplit('.', 1)[0]
 description = 'OpenERP Server'
 long_desc = '''\
 OpenERP is a complete ERP and CRM. The main features are accounting (analytic
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 01b6a0f0af8..ee7c1c53ee8 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -92,7 +92,7 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None):
                 idref2['time'] = time
                 idref2['DateTime'] = DateTime
                 import release
-                idref2['version'] = release.version.rsplit('.', 1)[0]
+                idref2['version'] = release.major_version
                 idref2['ref'] = lambda x: self.id_get(cr, False, x)
                 if len(f_model):
                     idref2['obj'] = _obj(self.pool, cr, uid, f_model, context=context)
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index cc71dd6886f..6d65a425484 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -104,7 +104,7 @@ def init_db(cr):
                         category_id, state) \
                     values (%d, %s, %s, %s, %s, %s, %s, %d, %s)', (
                 id, info.get('author', ''),
-                release.version.rsplit('.', 1)[0] + '.' + info.get('version', ''),
+                release.major_version + '.' + info.get('version', ''),
                 info.get('website', ''), i, info.get('name', False),
                 info.get('description', ''), p_id, state))
             dependencies = info.get('depends', [])
diff --git a/bin/addons/base/module/parse_version.py b/bin/tools/parse_version.py
similarity index 100%
rename from bin/addons/base/module/parse_version.py
rename to bin/tools/parse_version.py