squash: Move cleanup under finally block

Author: martinhoyer

tmt/steps/execute/__init__.py

@@ -828,9 +828,10 @@ def prepare_scripts(self, guest: "tmt.steps.provision.Guest") -> None:
         # Keep track of ScriptTemplate instances for later cleanup
         templates_to_cleanup: list[ScriptTemplate] = []
 
-        for script in self.scripts:
-            if not script.enabled(guest):
-                continue
+        try:
+            for script in self.scripts:
+                if not script.enabled(guest):
+                    continue
 
             with script as source:
                 # If it's a template, prevent immediate cleanup and track it
@@ -869,42 +870,43 @@ def prepare_scripts(self, guest: "tmt.steps.provision.Guest") -> None:
                     scripts_by_target_dir[target_dir] = []
                 scripts_by_target_dir[target_dir].append(source_path)
 
-        # Push script batches grouped by target directory
-        for target_dir, source_paths in scripts_by_target_dir.items():
-            if not source_paths:
-                continue
-
-            self.debug(f"Pushing script batch ({len(source_paths)} files) to {target_dir}")
-            guest.push(
-                source=source_paths,
-                destination=target_dir,
-                options=["-s", "-p", "--chmod=755"],
-                superuser=guest.facts.is_superuser is not True,
-            )
-
-        # Create aliases on the guest (only within the default scripts_dest_dir)
-        full_alias_command = ShellScript("")  # Start with an empty script
-        alias_count = 0
-        for target_path, aliases in aliases_to_create.items():
-            for alias in aliases:
-                link_path = scripts_dest_dir / alias
-                # Use absolute path for symlink target for simplicity/robustness
-                single_alias_cmd = ShellScript(
-                    f"ln -sf {target_path.as_posix()} {link_path.as_posix()}"
+            # Push script batches grouped by target directory
+            for target_dir, source_paths in scripts_by_target_dir.items():
+                if not source_paths:
+                    continue
+
+                self.debug(f"Pushing script batch ({len(source_paths)} files) to {target_dir}")
+                guest.push(
+                    source=source_paths,
+                    destination=target_dir,
+                    options=["-s", "-p", "--chmod=755"],
+                    superuser=guest.facts.is_superuser is not True,
                 )
-                if alias_count == 0:
-                    full_alias_command = single_alias_cmd
-                else:
-                    full_alias_command &= single_alias_cmd  # Use the '&' operator (__and__)
-                alias_count += 1
 
-        if alias_count > 0:
-            self.debug("Creating script aliases on guest.")
-            guest.execute(full_alias_command, friendly_command="Create script aliases")
-
-        # Cleanup rendered templates now that they've been pushed
-        for template_script in templates_to_cleanup:
-            template_script.cleanup()
+            # Create aliases on the guest (only within the default scripts_dest_dir)
+            full_alias_command = ShellScript("")  # Start with an empty script
+            alias_count = 0
+            for target_path, aliases in aliases_to_create.items():
+                for alias in aliases:
+                    link_path = scripts_dest_dir / alias
+                    # Use absolute path for symlink target for simplicity/robustness
+                    single_alias_cmd = ShellScript(
+                        f"ln -sf {target_path.as_posix()} {link_path.as_posix()}"
+                    )
+                    if alias_count == 0:
+                        full_alias_command = single_alias_cmd
+                    else:
+                        full_alias_command &= single_alias_cmd  # Use the '&' operator (__and__)
+                    alias_count += 1
+
+            if alias_count > 0:
+                self.debug("Creating script aliases on guest.")
+                guest.execute(full_alias_command, friendly_command="Create script aliases")
+
+        finally:
+            # Cleanup rendered templates now that they've been pushed (or if an error occurred)
+            for template_script in templates_to_cleanup:
+                template_script.cleanup()
 
     def _tmt_report_results_filepath(self, invocation: TestInvocation) -> Path:
         """