[Openerp-community] [Merge] lp:~openerp-community/openobject-server/yolanda.robla-openerp-server into lp:openobject-server/6.1

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[Openerp-community] [Merge] lp:~openerp-community/openobject-server/yolanda.robla-openerp-server into lp:openobject-server/6.1

Yolanda Robla
Yolanda Robla has proposed merging lp:~openerp-community/openobject-server/yolanda.robla-openerp-server into lp:openobject-server/6.1.

Requested reviews:
  Antony Lesuisse (OpenERP) (al-openerp)

For more details, see:
https://code.launchpad.net/~openerp-community/openobject-server/yolanda.robla-openerp-server/+merge/102810

This merge proposal is related to the new packages that are proposed for openerp (lp:~openerp-community/openerp-tools/yolanda.robla-openerp-core).
This package added some patches, to move code from /dist-packages/ to /usr/share/openerp. This changes is because inside /dist-packages, only python files are copied, but not XML, CSS, etc... that also are part of OpenERP addons.
To solve that, you did some rsync in your package. But people in Ubuntu server have recommended to simply change the path to /usr/share/openerp, and copy all content there.
So we need to modify openerp-server, to point to the right path.
--
https://code.launchpad.net/~openerp-community/openobject-server/yolanda.robla-openerp-server/+merge/102810
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-server/yolanda.robla-openerp-server.

=== modified file 'openerp-server'
--- openerp-server 2012-03-23 11:17:50 +0000
+++ openerp-server 2012-04-20 08:30:24 +0000
@@ -39,6 +39,7 @@
 import traceback
 import time
 
+sys.path.insert("/usr/share")
 import openerp
 __author__ = openerp.release.author
 __version__ = openerp.release.version
@@ -211,7 +212,7 @@
     # Workaround: py2exe and babel.
     if hasattr(sys, 'frozen'):
         import babel
-        babel.localedata._dirname = os.path.join(os.path.dirname(sys.executable), 'localedata')
+        babel.localedata._dirname = os.path.join(os.path.dirname(sys.executable), '/usr/share/openerp/localedata')
 
 if __name__ == "__main__":
 


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