OpenERP Community Backports (Web)

Merge lp:~therp-nl/ocb-web/6.1-lp1172306-session_directory_username into lp:ocb-web/6.1

  1. 6.1-lp1172306-session_directory_username
  2. Merge into 6.1
Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 2513
Proposed branch: lp:~therp-nl/ocb-web/6.1-lp1172306-session_directory_username
Merge into: lp:ocb-web/6.1
Diff against target: 20 lines (+7/-3)
1 file modified
addons/web/__init__.py (+7/-3)
To merge this branch: bzr merge lp:~therp-nl/ocb-web/6.1-lp1172306-session_directory_username
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Holger Brunn (Therp) code review Approve
Review via email: mp+168530@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/__init__.py'
2--- addons/web/__init__.py 2012-02-10 10:34:26 +0000
3+++ addons/web/__init__.py 2013-06-10 19:20:33 +0000
4@@ -18,9 +18,13 @@
5 o.dbfilter = openerp.tools.config['dbfilter']
6 o.server_wide_modules = openerp.conf.server_wide_modules or ['web']
7 try:
8- username = getpass.getuser()
9- except Exception:
10- username = "unknown"
11+ import pwd
12+ username = pwd.getpwuid(os.geteuid()).pw_name
13+ except ImportError:
14+ try:
15+ username = getpass.getuser()
16+ except Exception:
17+ username = "unknown"
18 o.session_storage = os.path.join(tempfile.gettempdir(), "oe-sessions-" + username)
19 o.addons_path = openerp.modules.module.ad_paths
20 o.serve_static = True

Subscribers

People subscribed via source and target branches