File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed
Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -218,7 +218,8 @@ def _reformat(self):
218218 if self ._device .format .type == fmt .type :
219219 return
220220
221- if safe_mode and (self ._device .format .type is not None or self ._device .format .name != get_format (None ).name ):
221+ if safe_mode and (self ._device .format .type is not None or self ._device .format .name != get_format (None ).name ) and \
222+ not packages_only :
222223 raise BlivetAnsibleError ("cannot remove existing formatting on volume '%s' in safe mode" % self ._volume ['name' ])
223224
224225 if self ._device .format .status and not packages_only :
@@ -438,7 +439,7 @@ def _create_members(self):
438439 members = list ()
439440 for disk in self ._disks :
440441 if not disk .isleaf or disk .format .type is not None :
441- if safe_mode :
442+ if safe_mode and not packages_only :
442443 raise BlivetAnsibleError ("cannot remove existing formatting and/or devices on disk '%s' (pool '%s') in safe mode" % (disk .name , self ._pool ['name' ]))
443444 else :
444445 self ._blivet .devicetree .recursive_remove (disk )
@@ -501,7 +502,7 @@ def _look_up_device(self):
501502 def _create (self ):
502503 if self ._device .format .type != "disklabel" or \
503504 self ._device .format .label_type != disklabel_type :
504- if safe_mode :
505+ if safe_mode and not packages_only :
505506 raise BlivetAnsibleError ("cannot remove existing formatting and/or devices on disk '%s' "
506507 "(pool '%s') in safe mode" % (self ._device .name , self ._pool ['name' ]))
507508 else :
You can’t perform that action at this time.
0 commit comments