diff --git a/librepomgr/buildactions/preparebuild.cpp b/librepomgr/buildactions/preparebuild.cpp index 761d6d9..b621197 100644 --- a/librepomgr/buildactions/preparebuild.cpp +++ b/librepomgr/buildactions/preparebuild.cpp @@ -437,14 +437,15 @@ void PrepareBuild::fetchMissingBuildData() for (const auto &pkgbuildsDir : m_pkgbuildsDirs) { const auto variant = packageNameData.variant(); try { - if (const auto pkgbuildPath = pkgbuildsDir % '/' % packageName; + if (const auto directPkgbuildPath = pkgbuildsDir % '/' % packageName; std::filesystem::exists(pkgbuildsDir % '/' % packageName + "/PKGBUILD")) { - buildData.originalSourceDirectory = tupleToString(pkgbuildPath); - } else if (const auto pkgbuildPath = pkgbuildsDir % '/' % packageNameData.actualName % '/' % variant; - filesystem::exists(pkgbuildPath + "/PKGBUILD")) { - buildData.originalSourceDirectory = tupleToString(pkgbuildPath); - } else if (const auto pkgbuildPath = pkgbuildsDir % '/' % packageName % "/trunk"; filesystem::exists(pkgbuildPath + "/PKGBUILD")) { - buildData.originalSourceDirectory = tupleToString(pkgbuildPath); + buildData.originalSourceDirectory = tupleToString(directPkgbuildPath); + } else if (const auto variantPkgbuildPath = pkgbuildsDir % '/' % packageNameData.actualName % '/' % variant; + filesystem::exists(variantPkgbuildPath + "/PKGBUILD")) { + buildData.originalSourceDirectory = tupleToString(variantPkgbuildPath); + } else if (const auto svnPkgbuildPath = pkgbuildsDir % '/' % packageName % "/trunk"; + filesystem::exists(svnPkgbuildPath + "/PKGBUILD")) { + buildData.originalSourceDirectory = tupleToString(svnPkgbuildPath); } else { continue; }