Don't raise safe_mode failures when packages_only is True.

linux-system-roles · Nov 8, 2019 · f8f0774 · f8f0774
1 parent cd36745
commit f8f0774
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/library/blivet.py b/library/blivet.py
@@ -222,7 +222,8 @@ def _reformat(self):
         if self._device.format.type == fmt.type:
             return
 
-        if safe_mode and (self._device.format.type is not None or self._device.format.name != get_format(None).name):
+        if safe_mode and (self._device.format.type is not None or self._device.format.name != get_format(None).name) and \
+           not packages_only:
             raise BlivetAnsibleError("cannot remove existing formatting on volume '%s' in safe mode" % self._volume['name'])
 
         if self._device.format.status and not packages_only:
@@ -452,7 +453,7 @@ def _create_members(self):
         members = list()
         for disk in self._disks:
             if not disk.isleaf or disk.format.type is not None:
-                if safe_mode:
+                if safe_mode and not packages_only:
                     raise BlivetAnsibleError("cannot remove existing formatting and/or devices on disk '%s' (pool '%s') in safe mode" % (disk.name, self._pool['name']))
                 else:
                     self._blivet.devicetree.recursive_remove(disk)
@@ -516,7 +517,7 @@ def _look_up_device(self):
     def _create(self):
         if self._device.format.type != "disklabel" or \
            self._device.format.label_type != disklabel_type:
-            if safe_mode:
+            if safe_mode and not packages_only:
                 raise BlivetAnsibleError("cannot remove existing formatting and/or devices on disk '%s' "
                                          "(pool '%s') in safe mode" % (self._device.name, self._pool['name']))
             else: