enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armbian-next: patching: don't rewrite empty desc as "None"

Browse Source
This commit is contained in:
Ricardo Pardini 2023-01-15 17:06:57 +01:00
parent 3c7587ef84
commit 0207d5f517
No known key found for this signature in database
GPG Key ID: 3D38CA12A66C5D02
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tools/common/patching_utils.py
View File

@ -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}"