Revert ahead-fix for conflict merge

brondani · brondani · commit e27a5fa0409c · 2026-06-26T14:06:26.000+02:00
diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp
@@ -550,7 +550,7 @@ bool ProjMgrWorker::LoadAllRelevantPacks() {
     return false;
   }
   // Get installed packs
-  if (m_rpcMode || noPackRequirements || (m_loadPacksPolicy == LoadPacksPolicy::ALL) || (m_loadPacksPolicy == LoadPacksPolicy::LATEST)) {
+  if (noPackRequirements || (m_loadPacksPolicy == LoadPacksPolicy::ALL) || (m_loadPacksPolicy == LoadPacksPolicy::LATEST)) {
     const bool latest = (m_loadPacksPolicy == LoadPacksPolicy::LATEST) || (m_loadPacksPolicy == LoadPacksPolicy::DEFAULT);
     if (!m_kernel->GetEffectivePdscFiles(pdscFiles, latest)) {
       ProjMgrLogger::Get().Error("parsing installed packs failed");

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ bool ProjMgrWorker::LoadAllRelevantPacks() {`
`550`	`550`	`return false;`
`551`	`551`	`}`
`552`	`552`	`// Get installed packs`
`553`		`- if (m_rpcMode \|\| noPackRequirements \|\| (m_loadPacksPolicy == LoadPacksPolicy::ALL) \|\| (m_loadPacksPolicy == LoadPacksPolicy::LATEST)) {`
	`553`	`+ if (noPackRequirements \|\| (m_loadPacksPolicy == LoadPacksPolicy::ALL) \|\| (m_loadPacksPolicy == LoadPacksPolicy::LATEST)) {`
`554`	`554`	`const bool latest = (m_loadPacksPolicy == LoadPacksPolicy::LATEST) \|\| (m_loadPacksPolicy == LoadPacksPolicy::DEFAULT);`
`555`	`555`	`if (!m_kernel->GetEffectivePdscFiles(pdscFiles, latest)) {`
`556`	`556`	`ProjMgrLogger::Get().Error("parsing installed packs failed");`