Fix Prepare Release CI job failures

- Inhibit enforce-tornado-imports pre-commit hook (fixes sed error)
- Fix trailing whitespace in generated Debian changelog
- Fix missing newline and trailing whitespace in generated release notes

Author: dwoz

.pre-commit-config.yaml

@@ -1916,7 +1916,8 @@ repos:
     hooks:
       - id: enforce-tornado-imports
         name: Enforce Tornado Imports
-        entry: bash -c 'sed -i "s/salt\.ext\.tornado/tornado/g" "$@"' --
+        # Inhibited to prevent global rewrites
+        entry: echo "Inhibited enforce-tornado-imports"
         language: python
         always_run: true
         pass_filenames: false

tools/changelog.py

@@ -149,7 +149,9 @@ def update_deb(ctx: Context, salt_version: Version, draft: bool = False):
     if salt_version is None:
         salt_version = _get_salt_version(ctx)
     changes = _get_pkg_changelog_contents(ctx, salt_version)
-    formated = "\n".join([f"  {_.replace('-', '*', 1)}" for _ in changes.split("\n")])
+    formated = "\n".join(
+        [f"  {_.replace('-', '*', 1)}" if _.strip() else "" for _ in changes.split("\n")]
+    )
     dt = datetime.datetime.utcnow()
     date = dt.strftime("%a, %d %b %Y %H:%M:%S +0000")
     tmpchanges = "pkg/rpm/salt.spec.1"
@@ -256,13 +258,15 @@ def update_release_notes(
             return
 
     unreleased = " - UNRELEASED"
-    warning = """
-<!---
-Do not edit this file. This is auto generated.
-Edit the templates in doc/topics/releases/templates/
-for a given release.
--->
-    """
+    warning = textwrap.dedent(
+        """
+        <!---
+        Do not edit this file. This is auto generated.
+        Edit the templates in doc/topics/releases/templates/
+        for a given release.
+        -->
+        """
+    ).strip()
     if release is True:
         unreleased = ""
 
@@ -279,7 +283,7 @@ def update_release_notes(
 
     tmp_release_notes_path.write_text(content)
     try:
-        contents = tmp_release_notes_path.read_text().strip()
+        contents = tmp_release_notes_path.read_text().strip() + "\n"
         if draft:
             ctx.print(contents, soft_wrap=True)
         else: