bin/gen_release_notes.py: do not end "features" with "None"

Currently, the "New features" list unconditionally ends with a "None"
point, which makes no sense. The original author probably meant to check
whether the file is empty, so remove the else clause, and add the check
for emptiness.

Cc: mesa-stable
Signed-off-by: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20241>
(cherry picked from commit bd807eecd16eb308e121ff6d51210edee8635083)

diff --git a/.pick_status.json b/.pick_status.json
index a56f8a6..fd70e9f 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3937,7 +3937,7 @@
         "description": "bin/gen_release_notes.py: do not end \"features\" with \"None\"",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },

diff --git a/bin/gen_release_notes.py b/bin/gen_release_notes.py
index 2f6750f..b323fc2 100755 (executable)
--- a/bin/gen_release_notes.py
+++ b/bin/gen_release_notes.py
@@ -282,14 +282,12 @@ def calculate_previous_version(version: str, is_point: bool) -> str:
 
 def get_features(is_point_release: bool) -> typing.Generator[str, None, None]:
     p = pathlib.Path(__file__).parent.parent / 'docs' / 'relnotes' / 'new_features.txt'
-    if p.exists():
+    if p.exists() and p.stat().st_size > 0:
         if is_point_release:
             print("WARNING: new features being introduced in a point release", file=sys.stderr)
         with p.open('rt') as f:
             for line in f:
                 yield line.rstrip()
-            else:
-                yield "None"
         p.unlink()
     else:
         yield "None"