Fix too greedy match for replacing workspace value

Author: Flamefire

easybuild/easyblocks/generic/cargo.py

@@ -253,9 +253,13 @@ def do_replacement(section, workspace_section):
         for key, value in section.items():
             if (key.endswith(SUFFIX) and value == 'true') or value == '{ workspace = true }':
                 real_key = key[:-len(SUFFIX)] if key.endswith(SUFFIX) else key
-                value = workspace_section[real_key]
-                idx = next(idx for idx, line in enumerate(lines) if key in line)
-                lines[idx] = f'{real_key} = {value}'
+                new_value = workspace_section[real_key]
+                try:
+                    idx = next(idx for idx, line in enumerate(lines)
+                               if line.lstrip().startswith(f'{key} =') and value in line)
+                except StopIteration:
+                    raise ValueError(f"Failed to find line for key '{key}' while merging {cargo_toml_path}")
+                lines[idx] = f'{real_key} = {new_value}'
 
     do_replacement(cargo_toml.get('package'), workspace_toml.get('workspace.package'))
     do_replacement(cargo_toml.get('dependencies'), workspace_toml.get('workspace.dependencies'))

test/easyblocks/easyblock_specific.py

@@ -449,6 +449,9 @@ def test_cargo_merge_sub_crate(self):
             description.workspace = true
             documentation.workspace = true
 
+            # Unrelated line that looks like a workspace key
+            description = "Uses regex=123 and regex = 456 and not foo.workspace = true"
+
             [dependencies]
             regex.workspace = true
 
@@ -467,6 +470,9 @@ def test_cargo_merge_sub_crate(self):
             description = "A short description of my package"
             documentation = "https://example.com/bar"
 
+            # Unrelated line that looks like a workspace key
+            description = "Uses regex=123 and regex = 456 and not foo.workspace = true"
+
             [dependencies]
             regex = { version = "1.6.0", default-features = false, features = ["std"] }