[MERGE] trunk

bzr revid: abo@openerp.com-20121030154647-6acbljvitcmphriz

20 files changed, 49 insertions, 39 deletions

diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index 7ee562d4d29..be59b9ae5b5 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -22,6 +22,7 @@
 import logging
 import os
 import tempfile
+import getpass
 import urllib
 
 import werkzeug.urls
@@ -43,7 +44,16 @@ from .. import utils
 _logger = logging.getLogger(__name__)
 oidutil.log = _logger.debug
 
-_storedir = os.path.join(tempfile.gettempdir(), 'openerp-auth_openid-store')
+def get_system_user():
+    """Return system user info string, such as USERNAME-EUID"""
+    info = getpass.getuser()
+    euid = getattr(os, 'geteuid', None) # Non available on some platforms
+    if euid is not None:
+        info = '%s-%d' % (info, euid())
+    return info
+
+_storedir = os.path.join(tempfile.gettempdir(), 
+                         'openerp-auth_openid-%s-store' % get_system_user())
 
 class GoogleAppsAwareConsumer(consumer.GenericConsumer):
     def complete(self, message, endpoint, return_to):
diff --git a/addons/auth_openid/i18n/ar.po b/addons/auth_openid/i18n/ar.po
index e630349610a..ec4fa4a985f 100644
--- a/addons/auth_openid/i18n/ar.po
+++ b/addons/auth_openid/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/de.po b/addons/auth_openid/i18n/de.po
index 985b8252ec1..d5915a6ca00 100644
--- a/addons/auth_openid/i18n/de.po
+++ b/addons/auth_openid/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/es.po b/addons/auth_openid/i18n/es.po
index ee0b738b7df..ce65376e76b 100644
--- a/addons/auth_openid/i18n/es.po
+++ b/addons/auth_openid/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/es_CR.po b/addons/auth_openid/i18n/es_CR.po
index 4de8625da50..c31062aacd3 100644
--- a/addons/auth_openid/i18n/es_CR.po
+++ b/addons/auth_openid/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/fi.po b/addons/auth_openid/i18n/fi.po
index eef27855ac5..6a7ec14e204 100644
--- a/addons/auth_openid/i18n/fi.po
+++ b/addons/auth_openid/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/fr.po b/addons/auth_openid/i18n/fr.po
index 51b81d3acbe..8a8f0c2dae5 100644
--- a/addons/auth_openid/i18n/fr.po
+++ b/addons/auth_openid/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/gu.po b/addons/auth_openid/i18n/gu.po
index e3784acd455..a66b126fab8 100644
--- a/addons/auth_openid/i18n/gu.po
+++ b/addons/auth_openid/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/ja.po b/addons/auth_openid/i18n/ja.po
index d6b227ac317..e7e3d9df59a 100644
--- a/addons/auth_openid/i18n/ja.po
+++ b/addons/auth_openid/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/nb.po b/addons/auth_openid/i18n/nb.po
index 55c0a4933a8..1b67ede6a5d 100644
--- a/addons/auth_openid/i18n/nb.po
+++ b/addons/auth_openid/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/nl.po b/addons/auth_openid/i18n/nl.po
index 0cbe0785644..27a4eabc1db 100644
--- a/addons/auth_openid/i18n/nl.po
+++ b/addons/auth_openid/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/pl.po b/addons/auth_openid/i18n/pl.po
index ffaba43d98a..65b4019f150 100644
--- a/addons/auth_openid/i18n/pl.po
+++ b/addons/auth_openid/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
-"X-Generator: Launchpad (build 16194)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/pt.po b/addons/auth_openid/i18n/pt.po
index 04a6765fb30..8c48313e3d0 100644
--- a/addons/auth_openid/i18n/pt.po
+++ b/addons/auth_openid/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/pt_BR.po b/addons/auth_openid/i18n/pt_BR.po
index 8a30bb9abb9..31676722009 100644
--- a/addons/auth_openid/i18n/pt_BR.po
+++ b/addons/auth_openid/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/ro.po b/addons/auth_openid/i18n/ro.po
index aeaa8a10c9e..b82395847e5 100644
--- a/addons/auth_openid/i18n/ro.po
+++ b/addons/auth_openid/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/sk.po b/addons/auth_openid/i18n/sk.po
index 4d825fe0525..c4b7f9aa598 100644
--- a/addons/auth_openid/i18n/sk.po
+++ b/addons/auth_openid/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/sr@latin.po b/addons/auth_openid/i18n/sr@latin.po
index 89244941ca2..92c63d285d2 100644
--- a/addons/auth_openid/i18n/sr@latin.po
+++ b/addons/auth_openid/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/sv.po b/addons/auth_openid/i18n/sv.po
index b25766fb442..91118cd1de2 100644
--- a/addons/auth_openid/i18n/sv.po
+++ b/addons/auth_openid/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/tr.po b/addons/auth_openid/i18n/tr.po
index 999ba0ff1a8..dae4a9a0ba5 100644
--- a/addons/auth_openid/i18n/tr.po
+++ b/addons/auth_openid/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/zh_CN.po b/addons/auth_openid/i18n/zh_CN.po
index 3b95b298f86..0434f8afbed 100644
--- a/addons/auth_openid/i18n/zh_CN.po
+++ b/addons/auth_openid/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid