Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix shadowing warning

This commit is contained in:
Martchus 2021-12-05 00:17:09 +01:00
parent 567c3aaf56
commit 0a2c41ee0c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
librepomgr/buildactions/preparebuild.cpp
View File

@ -437,14 +437,15 @@ void PrepareBuild::fetchMissingBuildData()
for (const auto &pkgbuildsDir : m_pkgbuildsDirs) { for (const auto &pkgbuildsDir : m_pkgbuildsDirs) {
const auto variant = packageNameData.variant(); const auto variant = packageNameData.variant();
try { try {
if (const auto pkgbuildPath = pkgbuildsDir % '/' % packageName; if (const auto directPkgbuildPath = pkgbuildsDir % '/' % packageName;
std::filesystem::exists(pkgbuildsDir % '/' % packageName + "/PKGBUILD")) { std::filesystem::exists(pkgbuildsDir % '/' % packageName + "/PKGBUILD")) {
buildData.originalSourceDirectory = tupleToString(pkgbuildPath); buildData.originalSourceDirectory = tupleToString(directPkgbuildPath);
} else if (const auto pkgbuildPath = pkgbuildsDir % '/' % packageNameData.actualName % '/' % variant; } else if (const auto variantPkgbuildPath = pkgbuildsDir % '/' % packageNameData.actualName % '/' % variant;
filesystem::exists(pkgbuildPath + "/PKGBUILD")) { filesystem::exists(variantPkgbuildPath + "/PKGBUILD")) {
buildData.originalSourceDirectory = tupleToString(pkgbuildPath); buildData.originalSourceDirectory = tupleToString(variantPkgbuildPath);
} else if (const auto pkgbuildPath = pkgbuildsDir % '/' % packageName % "/trunk"; filesystem::exists(pkgbuildPath + "/PKGBUILD")) { } else if (const auto svnPkgbuildPath = pkgbuildsDir % '/' % packageName % "/trunk";
buildData.originalSourceDirectory = tupleToString(pkgbuildPath); filesystem::exists(svnPkgbuildPath + "/PKGBUILD")) {
buildData.originalSourceDirectory = tupleToString(svnPkgbuildPath);
} else { } else {
continue; continue;
} }