xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-01-31 05:17:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge "Recognize another etag message"

Browse Source
This commit is contained in:
Zuul 2021-11-04 13:59:33 +00:00 committed by Gerrit Code Review
commit f797e95e84
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pyghmi/redfish/command.py
View File

@ -1091,7 +1091,8 @@ class Command(object):
self._set_system_configuration(changeset)
return
except exc.RedfishError as re:
if 'etag' not in re.msgid.lower():
if ('etag' not in re.msgid.lower()
and 'PreconditionFailed' not in re.msgid):
raise
def _set_system_configuration(self, changeset):
@ -1139,7 +1140,8 @@ class Command(object):
if not normval.endswith('*'):
normval += '*'
for cand in currsettings[change]['possible']:
if fnmatch(cand.lower(), normval):
if fnmatch(cand.lower().replace(' ', ''),
normval.replace(' ', '')):
changeset[change] = cand
break
else: