Draft: Compare changes for Humble integration

sros2/sros2/keystore/_permission.py

@@ -79,14 +79,9 @@ def extend_permission_with_pcr(
     pcr_selection_children = []
 
     for line in pcr_values_data:
-        if line.startswith(" "):
-            data = line.strip()
-            if active_bank:
-                current_data += data + "\n"
-
-        elif line.startswith("s"): # All TPM banks hash algorithms start with s
+        if line.strip().startswith("s"): # All TPM banks hash algorithms start with s
             bank = line.replace(":", "").strip()
-            if active_bank:
+            if active_bank and current_data:
                 xml_element = etree.Element("pcr_selection", bank=active_bank)
                 xml_element.text = "\n" + current_data
                 pcr_selection_children.append(xml_element)
@@ -94,12 +89,17 @@ def extend_permission_with_pcr(
 
             active_bank = bank
             current_data = ""
+        elif line.startswith(" "):
+            data = line.strip()
+            if active_bank:
+                current_data += data + "\n"
         else:
             pass
 
-    xml_element = etree.Element("pcr_selection", bank=active_bank)
-    xml_element.text = "\n" + current_data
-    pcr_selection_children.append(xml_element)
+    if current_data:
+        xml_element = etree.Element("pcr_selection", bank=active_bank)
+        xml_element.text = "\n" + current_data
+        pcr_selection_children.append(xml_element)
 
     tree = etree.parse(permissions_path)
     root = tree.getroot()