[projmgr] Fall back to file version defined in the pack

When resolving the base file version for RTE files when the RTE directory has not yet been populated, fall back to the version defined in the pack. Contributed by STMicroelectronics Signed-off-by: Torbjörn SVENSSON <[email protected]> Co-authored-by: Samuel HULTGREN <[email protected]>
Open-CMSIS-Pack · Dec 12, 2023 · aaa5502 · aaa5502
1 parent 455dbd7
commit aaa5502
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/libs/rtemodel/src/RteProject.cpp b/libs/rtemodel/src/RteProject.cpp
@@ -436,14 +436,18 @@ void RteProject::AddCprjComponents(const Collection<RteItem*>& selItems, RteTarg
   // update file versions
   for (auto [instanceName, fi] : m_files) {
     string version;
+    auto rteFile = fi->GetFile(target->GetName());
     auto itver = configFileVersions.find(instanceName); // file in cprj can be specified by its instance name
     if (itver == configFileVersions.end())
       itver = configFileVersions.find(fi->GetName()); // or by original name
     if (itver != configFileVersions.end()) {
       version = itver->second;
+    } else {
+      // Fall back to the version noted in the pack
+      version = rteFile->GetVersionString();
     }
     UpdateFileInstanceVersion(fi, version);
-    UpdateConfigFileBackups(fi, fi->GetFile(target->GetName()));
+    UpdateConfigFileBackups(fi, rteFile);
   }
 }