efi_resource command returns unexpected strings making the EFI parser results totally wrong

[Sylvain Pineau]

$ /usr/share/checkbox/scripts/efi_resource
path: /sys/class/dmi/id/bios_version
category: EFI
product: Lenovo
vendor: /var/log/kern.log:EFI v2.31

path: /sys/class/dmi/id/bios_version
category: EFI
product: Lenovo
vendor: /var/log/kern.log.1:EFI v2.31

==============================

Expected result:
path: /sys/class/dmi/id/bios_version
category: EFI
product: EFI v2.31
vendor: Lenovo

[Sylvain Pineau (sylvain-pineau)]

First thing to fix is the command used by efi_resource:

-COMMAND = "[ -d /sys/firmware/efi ] && cat /var/log/kern.log* | grep -m 1 -o --color=never 'EFI v.*' || true"
+COMMAND = "[ -d /sys/firmware/efi ] && grep -m 1 -o --color=never 'EFI v.*' /var/log/kern.log* || true"

[Sylvain Pineau (sylvain-pineau)]

And the parser also has to be fixed in order to return product and vendor in the right order:

- r"^(?P<vendor>.*)\s+by\s+(?P<product>.*)$")
+ r"^(?P<product>.*)\s+by\s+(?P<vendor>.*)$")

[Daniel Manrique (roadmr)]

OK, this is already fixed in trunk, thanks!