Author: bct Date: 2007-09-29 22:51:38 +0200 (Sat, 29 Sep 2007) New Revision: 8874

Modified: trunk/src/common/defs.py trunk/src/common/optparser.py Log: remove old unencrypted secrets file

Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2007-09-29 20:51:01 UTC (rev 8873) +++ trunk/src/common/defs.py 2007-09-29 20:51:38 UTC (rev 8874) @@ -2,7 +2,7 @@

datadir = '../'

-version = '0.11.2.0-svn' +version = '0.11.2.1-svn'

import sys, os.path for base in ('.', 'common'):

Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2007-09-29 20:51:01 UTC (rev 8873) +++ trunk/src/common/optparser.py 2007-09-29 20:51:38 UTC (rev 8874) @@ -166,6 +166,8 @@ self.update_config_to_01114() if old < [0, 11, 1, 5] and new >= [0, 11, 1, 5]: self.update_config_to_01115() + if old < [0, 11, 2, 1] and new >= [0, 11, 2, 1]: + self.update_config_to_01121()

gajim.logger.init_vars() gajim.config.set('version', new_version) @@ -479,3 +481,16 @@ pass con.close() gajim.config.set('version', '0.11.1.5') + + def update_config_to_01121(self): + # remove old unencrypted secrets file + from common.configpaths import gajimpaths + + new_file = gajimpaths['SECRETS_FILE'] + + old_file = os.path.dirname(new_file) + '/secrets' + + if os.path.exists(old_file): + os.remove(old_file) + + gajim.config.set('version', '0.11.2.1')