mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 03:32:12 +02:00
sanity: getstatusoutput returns an int, not a string
This code is an error path so nobody noticed that oe.utils.getstatusoutput() is just a wrapper around subprocess.getstatusoutput() which returns an (int, string) pair not (string, string). (From OE-Core rev: 33bf6e05af0a68da32f0484460b1de5f7f4eea98) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
64b5d93f3a
commit
daa509f9e4
@@ -462,7 +462,7 @@ def check_make_version(sanity_data):
|
||||
from distutils.version import LooseVersion
|
||||
status, result = oe.utils.getstatusoutput("make --version")
|
||||
if status != 0:
|
||||
return "Unable to execute make --version, exit code %s\n" % status
|
||||
return "Unable to execute make --version, exit code %d\n" % status
|
||||
version = result.split()[2]
|
||||
if LooseVersion(version) == LooseVersion("3.82"):
|
||||
# Construct a test file
|
||||
@@ -498,7 +498,7 @@ def check_tar_version(sanity_data):
|
||||
from distutils.version import LooseVersion
|
||||
status, result = oe.utils.getstatusoutput("tar --version")
|
||||
if status != 0:
|
||||
return "Unable to execute tar --version, exit code %s\n" % status
|
||||
return "Unable to execute tar --version, exit code %d\n" % status
|
||||
version = result.split()[3]
|
||||
if LooseVersion(version) < LooseVersion("1.24"):
|
||||
return "Your version of tar is older than 1.24 and has bugs which will break builds. Please install a newer version of tar.\n"
|
||||
@@ -511,7 +511,7 @@ def check_git_version(sanity_data):
|
||||
from distutils.version import LooseVersion
|
||||
status, result = oe.utils.getstatusoutput("git --version 2> /dev/null")
|
||||
if status != 0:
|
||||
return "Unable to execute git --version, exit code %s\n" % status
|
||||
return "Unable to execute git --version, exit code %d\n" % status
|
||||
version = result.split()[2]
|
||||
if LooseVersion(version) < LooseVersion("1.8.3.1"):
|
||||
return "Your version of git is older than 1.8.3.1 and has bugs which will break builds. Please install a newer version of git.\n"
|
||||
|
||||
Reference in New Issue
Block a user