No AFS means OSError, not CallError.

[wizard.git] / plugins / scripts / wizard_scripts.py

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
             return url
         except shell.CallError:
             pass

+        except OSError:
+            pass

     return None
 
 def sql_drop(url):
     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()
             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:
         except shell.CallError:
             raise install.StrategyFailed
         if len(self._triplet) != 3: