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

[jftempo]

=== modified file 'bin/tools/config.py'
--- bin/tools/config.py	2012-07-16 09:52:42 +0000
+++ bin/tools/config.py	2012-10-22 13:57:26 +0000
@@ -26,6 +26,7 @@
 import netsvc
 import logging
 import release
+from base64 import b64decode, b64encode
 
 def check_ssl():
     try:
@@ -453,8 +454,13 @@
             for (name,value) in p.items('options'):
                 if value=='True' or value=='true':
                     value = True
-                if value=='False' or value=='false':
+                elif value=='False' or value=='false':
                     value = False
+                elif 'pass' in name:
+                    try:
+                        value = b64decode(value)
+                    except:
+                        pass
                 self.options[name] = value
             #parse the other sections, as well
             for sec in p.sections():
@@ -484,6 +490,8 @@
                 continue
             if opt in ('log_level', 'assert_exit_level'):
                 p.set('options', opt, loglevelnames.get(self.options[opt], self.options[opt]))
+            elif 'pass' in opt and isinstance(self.options[opt], (str, unicode)):
+                p.set('options', opt, b64encode(self.options[opt]))
             else:
                 p.set('options', opt, self.options[opt])