From: Alexander Kanavin Date: Tue, 7 Oct 2025 12:46:51 +0000 (+0200) Subject: runqemu: ensure that bitbake environment is either returned, or an exception is raised X-Git-Tag: uninative-5.0~74 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8197be4dd336be2f8a646916223922da61c5b9b1;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git runqemu: ensure that bitbake environment is either returned, or an exception is raised This eliminates the other remaining code path where environment getter returns 'nothing'. This and the previous patch were tested in a-full, and no errors occurred [1], which means the code paths that make use of the function returning nothing are never actually executed and can be cleaned up (in the following patch). The rationale is that if environment getter cannot obtain the environment, it should report that and not sweep the issue under the carpet; it's up to the caller to handle that situation, or make pre-emptive checks that avoid calling the environment getter when it is bound to fail. [1] https://lists.openembedded.org/g/openembedded-core/message/223651 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/scripts/runqemu b/scripts/runqemu index 32c7a2aab3..ed1350a728 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1744,11 +1744,7 @@ to your build configuration. cmd = 'MACHINE=%s bitbake -e %s %s' % (mach, multiconfig, target) else: cmd = 'bitbake -e %s %s' % (multiconfig, target) - try: - return subprocess.check_output(cmd, shell=True).decode('utf-8') - except subprocess.CalledProcessError as err: - logger.warning("Couldn't run '%s' to gather environment information, giving up with 'bitbake -e':\n%s" % (cmd, err.output.decode('utf-8'))) - return '' + return subprocess.check_output(cmd, shell=True).decode('utf-8') def load_bitbake_env(self, mach=None, target=None):