Prefer pkg_version
Use the pkg_version where available, it seems to match more. Change-Id: Ib419539adff86334454bca838a970691604fc104
This commit is contained in:
parent
6ec04d585a
commit
e074eb1470
@ -617,7 +617,9 @@ class IMMClient(object):
|
|||||||
skipkeys.add(fwi['key'])
|
skipkeys.add(fwi['key'])
|
||||||
if fwi.get('fw_status', 0) == 2:
|
if fwi.get('fw_status', 0) == 2:
|
||||||
bdata = {}
|
bdata = {}
|
||||||
if 'fw_version_pend' in fwi:
|
if 'fw_pkg_version' in fwi and fwi['fw_pkg_version']:
|
||||||
|
bdata['version'] = fwi['fw_pkg_version']
|
||||||
|
elif 'fw_version_pend' in fwi:
|
||||||
bdata['version'] = fwi['fw_version_pend']
|
bdata['version'] = fwi['fw_version_pend']
|
||||||
yield '{0} Pending Update'.format(aname), bdata
|
yield '{0} Pending Update'.format(aname), bdata
|
||||||
for fwi in fwu.get('items', []):
|
for fwi in fwu.get('items', []):
|
||||||
|
@ -660,7 +660,9 @@ class OEMHandler(generic.OEMHandler):
|
|||||||
skipkeys.add(fwi['key'])
|
skipkeys.add(fwi['key'])
|
||||||
if fwi.get('fw_status', 0) == 2:
|
if fwi.get('fw_status', 0) == 2:
|
||||||
bdata = {}
|
bdata = {}
|
||||||
if 'fw_version_pend' in fwi:
|
if 'fw_pkg_version' in fwi and fwi['fw_pkg_version']:
|
||||||
|
bdata['version'] = fwi['fw_pkg_version']
|
||||||
|
elif 'fw_version_pend' in fwi:
|
||||||
bdata['version'] = fwi['fw_version_pend']
|
bdata['version'] = fwi['fw_version_pend']
|
||||||
yield '{0} Pending Update'.format(aname), bdata
|
yield '{0} Pending Update'.format(aname), bdata
|
||||||
for fwi in fdata.get('items', []):
|
for fwi in fdata.get('items', []):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user