Fix formatting error for backup restoration.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

diff --git a/TODO b/TODO
index 820beae41ff849a57f3e4a1790a48a383a7ff823..34fcbd7960de90cd5a37741c203740de960a5b69 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,6 +5,9 @@
     - need an upgrade story; srv needs more versions
     - need a story about install/ contrib/
 
+- Human readable quota output
+- Nice error message on --continue if you forgot to git add your
+  resolved file (look for conflict markers)
 - The merge interface is a kind of major UI disaster; you won't
   be able to use it unless you know how Git works.  Also, the
   merges can be quite difficult to resolve if upstream has made
@@ -12,6 +15,9 @@
   providing a --rebase option, which seems to do better when
   big problems like this show up.
 
+- Better mass-* support for just one user (this includes letting
+  a user mass upgrade just his own autoinstalls)
+
 - Show progress or something when upgrading
 - Allow 'sticky notes' for future upgraders to notice
 - .wizard/url semantics are subtly wrong: in particular, if we

diff --git a/wizard/sql.py b/wizard/sql.py
index aafa6452b6ef912ce34059f7e923eb041775af5a..4848d22421bcb55dd826927f7c925175fd48b06a 100644 (file)
--- a/wizard/sql.py
+++ b/wizard/sql.py
@@ -82,8 +82,8 @@ def restore_mysql(backup_dir, deployment):
     """
     Database restoration for MySQL by piping SQL commands into :command:`mysql`.
     """
-    if not os.path.exists(backup_dir):
-        raise RestoreDatabaseError("Backup %s doesn't exist", backup_dir.rpartition("/")[2])
+    if not os.path.exists(backup_dir): # XXX possibly buggy
+        raise RestoreDatabaseError("Backup %s doesn't exist" % backup_dir.rpartition("/")[2])
     sql = open(os.path.join(backup_dir, "db.sql"), 'w+')
     shell.call("gunzip", "-c", os.path.join(backup_dir, "db.sql.gz"), stdout=sql)
     sql.seek(0)