From 0207d5f5174f6c3b5041b589655192bb62e92b3b Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 15 Jan 2023 17:06:57 +0100 Subject: [PATCH] armbian-next: `patching`: don't rewrite empty desc as "None" --- lib/tools/common/patching_utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/tools/common/patching_utils.py b/lib/tools/common/patching_utils.py index cfcf21bc52..fbb68b2238 100644 --- a/lib/tools/common/patching_utils.py +++ b/lib/tools/common/patching_utils.py @@ -459,7 +459,8 @@ class PatchInPatchFile: log.warning(f"Rescue: adding all changed files to git for {self}") repo.git.add(repo.working_tree_dir) - commit_message = f"{self.subject}\n\n{self.desc}" + desc_no_none = self.desc if self.desc is not None else "" + commit_message = f"{self.subject}\n\n{desc_no_none}" if add_rebase_tags: commit_message = f"{self.parent.relative_dirs_and_base_file_name}(:{self.counter})\n\nOriginal-Subject: {self.subject}\n{self.desc}"