Fixes for IrpDatabase version management.

bengtmartensson · Nov 11, 2024 · 27f61cf · 27f61cf
1 parent 57698c2
commit 27f61cf
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/org/harctoolbox/irp/IrpDatabase.java b/src/main/java/org/harctoolbox/irp/IrpDatabase.java
@@ -287,6 +287,7 @@ public IrpDatabase(Document doc) throws IrpParseException {
 
     public IrpDatabase(Element protocolsElement) throws IrpParseException {
         this();
+        version.append(protocolsElement.getAttribute(VERSION_NAME));
         patchProtocols(protocolsElement);
         expand();
         rebuildAliases();
@@ -855,6 +856,10 @@ private void appendToVersion(String version) {
         if (version.isEmpty())
             return;
 
+        // If version already ends with the patch version, do not apply again
+        if (this.version.toString().endsWith("+" + version))
+            return;
+
         if (this.version.length() > 0)
             this.version.append("+");
         this.version.append(version);