Add main-thread callbacks for download success/failure.

git-svn-id: file:///home/or/svnrepo/updater/trunk@17292 55e972cd-5a19-0410-ae62-a4d7a52db4cd

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/thandy/util.py b/lib/thandy/util.py
index 2db7df4..c1f1326 100644
--- a/lib/thandy/util.py
+++ b/lib/thandy/util.py
@@ -24,7 +24,6 @@ def moveFile(fromLocation, toLocation):
 
     os.rename(fromLocation, toLocation)
 
-
 def replaceFile(fname, contents, textMode=False):
     """overwrite the file in 'fname' atomically with the content of 'contents'
     """
@@ -48,13 +47,19 @@ def userFilename(name):
         os.makedirs(base, 0700)
     return os.path.join(base, name)
 
+def ensureParentDir(name):
+    """DOCDOC"""
+    directory = os.path.split(name)[0]
+    if not os.path.exists(directory):
+        os.makedirs(directory, 0700)
+
 def getKeylist(keys_fname, checkKeys=True):
     import thandy.master_keys
 
     keydb = thandy.formats.Keylist()
 
     for key in thandy.master_keys.MASTER_KEYS:
-        keydb.addKey(key)
+        keydb.addKey(thandy.keys.RSAKey.fromJSon(key))
 
     user_keys = userFilename("preload_keys")
     if os.path.exists(user_keys):