[PATCH 2/2] Add error handling around storageInitialize for unusable setups.

[David Lehman]

(cherry picked from commit d218cb298e4a62ee22f08232f4d600572d06bce1)

Related: rhbz#1236995
Related: rhbz#1198367
---
 blivet/__init__.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/blivet/__init__.py b/blivet/__init__.py
index 1f03777..33d2fde 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -178,7 +178,16 @@ def storageInitialize(storage, ksdata, protected):
     if protected:
         storage.config.protectedDevSpecs.extend(protected)

-    storage.reset()
+    while True:
+        try:
+            storage.reset()
+        except StorageError as e:
+            if errorHandler.cb(e) == ERROR_RAISE:
+                raise
+            else:
+                continue
+        else:
+            break

if protected and not flags.live_install and \
        not any(d.protected for d in storage.devices):