From 50503332d22e75a3ca7d0944394f1e199ca25010 Mon Sep 17 00:00:00 2001 From: souliane Date: Fri, 23 May 2014 13:00:35 +0200 Subject: [PATCH] memory: synchronize the upgrade to database v2 to be sure libervia's profile password is read to be written in the config file before its encryption --- src/memory/sqlite.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/memory/sqlite.py b/src/memory/sqlite.py index a2ae24fd..73d82d25 100644 --- a/src/memory/sqlite.py +++ b/src/memory/sqlite.py @@ -813,11 +813,10 @@ class Updater(object): return fixConfigOption('libervia', 'passphrase', password, False) d = self.dbpool.runQuery("SELECT value FROM param_ind WHERE category=? AND name=? AND profile_id=?", xmpp_pass_path + (profile_id,)) - d.addCallback(cb) + return d.addCallback(cb) d = self.dbpool.runQuery("SELECT id FROM profiles WHERE name='libervia'") d.addCallback(updateLiberviaConf) - - d = self.dbpool.runQuery("SELECT profile_id,value FROM param_ind WHERE category=? AND name=?", xmpp_pass_path) + d.addCallback(lambda dummy: self.dbpool.runQuery("SELECT profile_id,value FROM param_ind WHERE category=? AND name=?", xmpp_pass_path)) d.addCallback(encrypt_values) return d