Misc bug fixes.

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

diff --git a/TODO b/TODO
index ab3e7d6fe7c90805a1166255e11f18ca368d8e28..21ab933e56c8fb40b3c6a54fabdb118a1a37aa40 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,20 +3,9 @@ The Git Autoinstaller
 TODO NOW:
 
 - Keep my sanity when upgrading 1000 installs
-    - Custom merge algo: absolute php.ini symlinks to relative symlinks (this
-      does not seem to have been a problem in practice)
-    - Prune -7 call errors and automatically reprocess them (with a
-      strike out counter of 3)--this requires better error parsing.
     - Replace gaierror with a more descriptive name (this is a DNS error)
     - Stronger skips means that backup failures should also be avoided
     - Distinguish between types of backup failures
-    - Ignore empty blacklists; they should all have reasons
-
-- Figure out a way of collecting blacklist data from .scripts/blacklisted
-  and aggregate it together
-
-- Let users use Wizard when ssh'ed into Scripts
-    - Make single user mass-migrate work when not logged in as root
 
 - Make the rest of the world use Wizard
     - Make parallel-find.pl use `sudo -u username git describe --tags`
@@ -56,6 +45,7 @@ TODO NOW:
       if merge resolutions aren't careful.
 
 - Other stuff
+    - Make single user mass-migrate work when not logged in as root
     - Don't use the scripts heuristics unless we're on scripts with the
       AFS patch.  Check with `fs sysname`
     - Make 'wizard summary' generate nice pretty graphs of installs by date

diff --git a/tests/setup b/tests/setup
index da0fdacaeb0495aa47fbce37e1e621393bac85dc..699a5b9b5fb4effd62f48268030180b29287382e 100644 (file)
--- a/tests/setup
+++ b/tests/setup
@@ -17,7 +17,7 @@ export WIZARD_ADMIN_NAME="admin"
 export WIZARD_ADMIN_PASSWORD="wizard"
 
 if [ -e "config" ]; then
-    source config
+    source ./config
 fi
 
 if [ -e "$TESTDIR" ]; then

diff --git a/wizard/command/backup.py b/wizard/command/backup.py
index 82dd449c115c2be44a9632e584a4a663d6f842d0..d7be811414c33e566d12cdac1a0fa1cbc35e41eb 100644 (file)
--- a/wizard/command/backup.py
+++ b/wizard/command/backup.py
@@ -1,4 +1,4 @@
-from wizard import command, deploy, shell
+from wizard import command, deploy, shell, util
 
 def main(argv, baton):
     options, args = parse_args(argv, baton)