No AFS means OSError, not CallError.

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

diff --git a/TODO b/TODO
index 52a7a8a9b38e6bfa95821de24ab7e48a94e7477c..65347cee9cff502fac9fc6a6c8045eb79d4252bc 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,7 @@
+- Environment variables don't seem to be overriding plugin
+  strategies; rejigger the order.
+- prepare-config (and others) create .wizard dir even
+  when not strictly necessary
 - Bug out immediately if tags are not present in the master tip
   of the repository
 - pending doesn't seem to get written out properly sometimes (or
@@ -8,6 +12,24 @@
 - Newline checks are /really really/ expensive on AFS; see if
   we can minimize them or something.  Right now, we're testing
   a fix where we don't clone with --shared.
+- Replace .split("\n") with .splitlines()
+
+- Need to fix existing repo history? (not adding extra commits;
+  that'll be more difficult)
+
+    git rebase -i -p --root --onto COMMITID
+
+  This won't work if you need to change the very root of the
+  repository.  You'll probably end up with conflicts and have
+  to manually resolve everything afterwards.
+
+  But usually you won't need --root --onto unless you really
+  fucked up the pristine branch.  If you just need to change
+  the scripts spine,
+
+    git rebase -i -p COMMITID
+
+  should work.
 
 - [SCRIPTS] MediaWiki 1.6.7, 1.9.3 and 1.10.0
 

diff --git a/plugins/scripts/wizard_scripts.py b/plugins/scripts/wizard_scripts.py
index 648d8a7a08c6aa46e04ae17de2ee98bb8e40ccb6..7d2307285ec681fea255e1620f2bbb5b5b875116 100644 (file)
--- a/plugins/scripts/wizard_scripts.py
+++ b/plugins/scripts/wizard_scripts.py
@@ -121,6 +121,8 @@ def sql_auth(url):
             return url
         except shell.CallError:
             pass
+        except OSError:
+            pass
     return None
 
 def sql_drop(url):
@@ -185,6 +187,8 @@ class MysqlStrategy(install.Strategy):
             raise install.StrategyFailed
         try:
             self._triplet = shell.eval("/mit/scripts/sql/bin/get-password").split()
+        except OSError:
+            raise install.StrategyFailed
         except shell.CallError:
             raise install.StrategyFailed
         if len(self._triplet) != 3: