From 3e3821580aee4da3324414bf067c26f6e03ac49c Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 16 Nov 2022 09:48:10 +0100 Subject: [PATCH] mock: check for qemu-user-static to raise InvalidArchitecture() This specific error is better handled by upper Mock's code; e.g. we don't raise the ugly traceback: INFO: Unable to build arch armv7hl natively on arch x86_64. Setting forcearch to use software emulation. ERROR: The --forcearch=armv7hl feature requires the /usr/bin/qemu-arm-static file to be installed (typically qemu-user-static* package) Traceback (most recent call last): File "/usr/libexec/mock/mock", line 1087, in exitStatus = main() ^^^^^^ File "/usr/lib/python3.11/site-packages/mockbuild/trace_decorator.py", line 93, in trace result = func(*args, **kw) ^^^^^^^^^^^^^^^^^ File "/usr/libexec/mock/mock", line 709, in main check_arch_combination(config_opts['rpmbuild_arch'], config_opts) File "/usr/lib/python3.11/site-packages/mockbuild/trace_decorator.py", line 93, in trace result = func(*args, **kw) ^^^^^^^^^^^^^^^^^ File "/usr/libexec/mock/mock", line 565, in check_arch_combination raise RuntimeError( RuntimeError: The --forcearch=armv7hl feature requires the /usr/bin/qemu-arm-static file to be installed (typically qemu-user-static* package) --- mock/py/mock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mock/py/mock.py b/mock/py/mock.py index 37f5bcf31..76ab82354 100755 --- a/mock/py/mock.py +++ b/mock/py/mock.py @@ -562,7 +562,7 @@ def check_arch_combination(target_arch, config_opts): time.sleep(5) return - raise RuntimeError( + raise mockbuild.exception.InvalidArchitecture( f'The {option} feature requires the {binary} ' 'file to be installed (typically qemu-user-static* package)')