Nhomar Hernandez (Vauxoo) has proposed merging 
lp:~vauxoo/openobject-server/trunk-bug1076541 into lp:openobject-server.

Commit message:
Thanks to make mistakes we discover hidden bugs, i am fixing an old bug here 
related to bad manage of path without correct verifications.

Requested reviews:
  Olivier Dony (OpenERP) (odo-openerp)
  Raphaƫl Valyi - http://www.akretion.com (rvalyi)
  OpenERP R&D Team (openerp-dev): approve
Related bugs:
  Bug #1076541 in OpenERP Server: "[trunk] Addons path incorrect algorithm to 
load files."
  https://bugs.launchpad.net/openobject-server/+bug/1076541

For more details, see:
https://code.launchpad.net/~vauxoo/openobject-server/trunk-bug1076541/+merge/133564

Hello.

Reimplementation of a little feature that i think will bring more solid 
behaviour.

BUg #1076541 explain in what situation it was braking the server.

THanks.
-- 
https://code.launchpad.net/~vauxoo/openobject-server/trunk-bug1076541/+merge/133564
Your team OpenERP R&D Team is requested to review the proposed merge of 
lp:~vauxoo/openobject-server/trunk-bug1076541 into lp:openobject-server.
=== modified file 'openerp/tools/misc.py'
--- openerp/tools/misc.py	2012-10-24 16:15:27 +0000
+++ openerp/tools/misc.py	2012-11-08 21:32:23 +0000
@@ -141,9 +141,11 @@
         # Is it below 'addons_path' or 'root_path'?
         name = os.path.normcase(os.path.normpath(name))
         for root in adps + [rtp]:
-            if name.startswith(root):
+            abspathmodule = os.path.split(name)[0]
+            abspath = os.path.split(abspathmodule)[0]
+            if os.path.samefile(abspath,root):
                 base = root.rstrip(os.sep)
-                name = name[len(base) + 1:]
+                name = os.path.relpath(name,abspath)
                 break
         else:
             # It is outside the OpenERP root: skip zipfile lookup.

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to