Merge branch 'main' into new-aptly-install-style

Author: sacherjj

casper-node-util/usr/bin/casper-node-util

@@ -212,6 +212,18 @@ def is_toml_comment_or_empty(line_data):
 
 def replace_config_values(config_data, replace_file):
     """ Replace values in config_data with values for fields in replace_file """
+
+    # new line with replacement value if needed or original line
+    def original_or_replaced_line(replacements, header, name, line):
+        replacement_value = [r_value for r_header, r_name, r_value in replacements
+                             if header == r_header and name == r_name]
+        if len(replacement_value) == 0:
+            return line
+        else:
+            new_value = replacement_value[0]
+            print(f"Replacing {last_header}:{name} = {value} with {new_value}")
+            return f"{name} = {new_value}"
+
     replace_file_path = Path(replace_file)
     if not replace_file_path.exists():
         raise ValueError(f"Cannot replace values in config, {replace_file} does not exist.")
@@ -231,24 +243,26 @@ def replace_config_values(config_data, replace_file):
     last_header = None
     for line in config_data.splitlines():
         if is_toml_comment_or_empty(line):
-            new_output.append(line)
+            # See if this is a commented out value such as trusted_hash
+            try:
+                name, value = toml_name_value(line[1:])
+                line = original_or_replaced_line(replacements, last_header, name, line)
+                new_output.append(line)
+            except ValueError:
+                # parsing failed so comment isn't a name=value pair.
+                new_output.append(line)
             continue
         header = toml_header(line)
         if header is not None:
             last_header = header
             new_output.append(line)
             continue
         name, value = toml_name_value(line)
-        replacement_value = [r_value for r_header, r_name, r_value in replacements
-                             if last_header == r_header and name == r_name]
-        if replacement_value:
-            new_value = replacement_value[0]
-            print(f"Replacing {last_header}:{name} = {value} with {new_value}")
-            new_output.append(f"{name} = {new_value}")
-        else:
-            new_output.append(line)
-        # Make trailing new line
-        new_output.append("")
+        line = original_or_replaced_line(replacements, last_header, name, value)
+        new_output.append(line)
+
+    # Make trailing new line
+    new_output.append("")
     return "\n".join(new_output)
 
 def walk_path(path, include_dir=True):