| commit | 48e6171e36d479fa722b448fb4977bf1288ac7d9 | [log] [tgz] |
|---|---|---|
| author | George Liu <liuxiwei@inspur.com> | Tue Sep 08 13:39:16 2020 +0800 |
| committer | George Liu <liuxiwei@inspur.com> | Wed Sep 09 13:43:10 2020 +0800 |
| tree | 456754b9fd2e4823b299c755ae237e371422bc72 | |
| parent | 905805b127fc940a28a2a6378494c5efd43f0d15 [diff] |
fp5280g2: Fix parsing version_id format Use the aux property directly in dev_id.json if the version_id property fails to match the specified regex, and avoid list index out of range. Signed-off-by: George Liu <liuxiwei@inspur.com> Change-Id: I460bf357fd4a31498f07cde3e2778e22fc0b3de1
diff --git a/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 3256e83..0eaffff 100644 --- a/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -25,6 +25,9 @@ # count from the commit version count = re.findall("-(\d{1,4})-", version_id) + if not count: + return + release = re.findall("-r(\d{1,4})", version_id) if release: auxVer = count[0] + "{0:0>4}".format(release[0])