# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1400842835 -7200
# Node ID 5f7f913c05ac6d3493b563ad887683e66bc084a1
# Parent  a874a79ad0f52b58bfa0106985bf3d0e8780c066
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

diff -r a874a79ad0f5 -r 5f7f913c05ac src/memory/sqlite.py
--- a/src/memory/sqlite.py	Fri May 23 10:03:33 2014 +0200
+++ b/src/memory/sqlite.py	Fri May 23 13:00:35 2014 +0200
@@ -813,11 +813,10 @@
                     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