From cd55363a3ccf9eaaf865348b14ef5891186a0bfc Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Tue, 9 Mar 2021 06:19:40 +0000 Subject: [PATCH] Improve detection of the debuginfo rpm It's not likely for a package name to have the substring "-debuginfo", but just in case, implement more robust detection of the actual debuginfo rpm for a package by constructing the name more carefully. Signed-off-by: Patrick McCarty --- Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.common b/Makefile.common index ba48878..b6ab999 100644 --- a/Makefile.common +++ b/Makefile.common @@ -17,7 +17,7 @@ SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || $(call queryspec,%{NVR}\n,$(SPECFILE) SRPMFILE = results/$(SRPMVERS).src.rpm LATEST_RPMS = $(wildcard rpms/*.rpm) -DEBUGINFO_RPM = $(wildcard rpms/*-debuginfo-*.rpm) +DEBUGINFO_RPM = $(wildcard rpms/${PKG_NAME}-debuginfo-$(shell $(call queryspec,%{V}-%{R},${SPECFILE})).*.rpm) RPMS ?= $(LATEST_RPMS) WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )