From 962dd0088e5f819ffb8a0187b7a29e1f50f30876 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 13 Nov 2022 22:09:44 +0100 Subject: [PATCH] Fix computing source package name The `packageName` (key in build preparation) might not actually be `pkgbase` when rebuilding a binary package and `pkgbase` changes compared to what it was in the before. Then `packageName` is still set to the old `pkgbase` and we need to use the name from the actual source info (which is the name `pkgbase` value). --- 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 348e95c..5da28cd 100644 --- a/librepomgr/buildactions/conductbuild.cpp +++ b/librepomgr/buildactions/conductbuild.cpp @@ -1149,7 +1149,7 @@ void ConductBuild::addPackageToRepo( auto readLock = lockToRead(); const auto &buildData = m_buildPreparation.buildData[packageName]; const auto &firstPackage = buildData.packages.front().pkg; - auto sourcePackageName = packageName % '-' % firstPackage->version + m_sourcePackageExtension; + auto sourcePackageName = buildData.sourceInfo->name % '-' % firstPackage->version + m_sourcePackageExtension; // determine names of binary packages to be copied binaryPackages.reserve(buildData.packages.size());