From 55e19d90415319c30d9500bc07c1228e6810688c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 8 Apr 2023 19:26:46 +0200 Subject: [PATCH] Relax condition for adding `--skippgpcheck` The `signed` parameter might be used like this: ``` "$pkgname::git+https://github.com/ankitects/anki#tag=${_tag}?signed" ``` So we can't rely on `.git` preceding it. --- librepomgr/buildactions/conductbuild.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librepomgr/buildactions/conductbuild.cpp b/librepomgr/buildactions/conductbuild.cpp index 8a21d9b..7e50e5b 100644 --- a/librepomgr/buildactions/conductbuild.cpp +++ b/librepomgr/buildactions/conductbuild.cpp @@ -929,7 +929,7 @@ InvocationResult ConductBuild::invokeMakepkgToMakeSourcePackage(const BatchProce auto lock = lockToRead(); if (const auto &sourceInfo = m_buildPreparation.buildData[packageName].sourceInfo) { for (const auto &source : sourceInfo->sources) { - if (source.path.find(".git?signed") != std::string::npos) { + if (source.path.find("git") != std::string::npos && source.path.find("?signed") != std::string::npos) { // skip the GPG check at this point as makepkg won't actually clone the repository here additionalFlags.emplace_back("--skippgpcheck"); break;