From 289fd99e8e6d6f7d79578b094d5117c2ca7c5a2f Mon Sep 17 00:00:00 2001
From: Brendan Taylor <bct@diffeq.com>
Date: Sat, 29 Sep 2007 20:51:38 +0000
Subject: [PATCH] remove old unencrypted secrets file
---
src/common/defs.py | 2 +-
src/common/optparser.py | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/common/defs.py b/src/common/defs.py
index 18af3b5c6a..86ee6dce17 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -2,7 +2,7 @@ docdir = '../'
datadir = '../'
-version = '0.11.2.0-svn'
+version = '0.11.2.1-svn'
import sys, os.path
for base in ('.', 'common'):
diff --git a/src/common/optparser.py b/src/common/optparser.py
index cfed4994db..7a67b8b8c8 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -166,6 +166,8 @@ class OptionsParser:
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 @@ class OptionsParser:
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')
--
GitLab