Merge lp:~vauxoo/openobject-server/trunk-bug1076541 into lp:openobject-server

[Nhomar - Vauxoo]

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

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.

[lp:~vauxoo/openobject-server/trunk-bug1076541]

4549. By Nhomar - Vauxoo on 2012-11-08

[FIX] Secon part of the bug incorrect name passed to logger.

Unmerged revisions

4549. By Nhomar - Vauxoo on 2012-11-08

[FIX] Secon part of the bug incorrect name passed to logger.

4548. By Nhomar - Vauxoo on 2012-11-08

[REF] Implementing split based on os lib and not in string management

=== 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:38:20 +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.
@@ -218,7 +220,7 @@
     # Not found
     if name.endswith('.rml'):
         raise IOError('Report %r doesn\'t exist or deleted' % basename)
-    raise IOError('File not found: %s' % basename)
+    raise IOError('File not found: %s' % name)
 
 
 #----------------------------------------------------------