Unifield Server

Merge lp:~unifield-team/unifield-server/AIO-23 into lp:unifield-server

  1. AIO-23
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3417
Proposed branch: lp:~unifield-team/unifield-server/AIO-23
Merge into: lp:unifield-server
Diff against target: 34 lines (+9/-1)
1 file modified
bin/tools/config.py (+9/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/AIO-23
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+130814@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/tools/config.py'
2--- bin/tools/config.py 2012-07-16 09:52:42 +0000
3+++ bin/tools/config.py 2012-10-22 13:57:26 +0000
4@@ -26,6 +26,7 @@
5 import netsvc
6 import logging
7 import release
8+from base64 import b64decode, b64encode
9
10 def check_ssl():
11 try:
12@@ -453,8 +454,13 @@
13 for (name,value) in p.items('options'):
14 if value=='True' or value=='true':
15 value = True
16- if value=='False' or value=='false':
17+ elif value=='False' or value=='false':
18 value = False
19+ elif 'pass' in name:
20+ try:
21+ value = b64decode(value)
22+ except:
23+ pass
24 self.options[name] = value
25 #parse the other sections, as well
26 for sec in p.sections():
27@@ -484,6 +490,8 @@
28 continue
29 if opt in ('log_level', 'assert_exit_level'):
30 p.set('options', opt, loglevelnames.get(self.options[opt], self.options[opt]))
31+ elif 'pass' in opt and isinstance(self.options[opt], (str, unicode)):
32+ p.set('options', opt, b64encode(self.options[opt]))
33 else:
34 p.set('options', opt, self.options[opt])
35

Subscribers

People subscribed via source and target branches

to all changes: