Skip to content

Commit

Permalink
Merge pull request #1320 from liangxin1300/20240203_check_sanity
Browse files Browse the repository at this point in the history
[crmsh-4.6] Dev: ui_configure: verify all cib objects even if there is no primitive resource configured
  • Loading branch information
liangxin1300 authored Feb 21, 2024
2 parents 8a6e04b + f237c78 commit 6f7105b
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions crmsh/ui_configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -914,8 +914,7 @@ def _commit(self, force=False, replace=False):
rc1 = True
if replace and not force:
rc1 = cib_factory.is_current_cib_equal()
rc2 = cib_factory.has_no_primitives() or \
self._verify(mkset_obj("xml", "changed"), mkset_obj("xml"))
rc2 = self._verify(mkset_obj("xml", "changed"), mkset_obj("xml"))
if rc1 and rc2:
return cib_factory.commit(replace=replace)
if force or config.core.force:
Expand Down

0 comments on commit 6f7105b

Please sign in to comment.