| commit | 4c9d0ca2ce4664751d86f03e9c5599f8e539cb1f | [log] [tgz] |
|---|---|---|
| author | Hsin-chen Chuang <[email protected]> | Tue Oct 08 07:18:59 2024 |
| committer | Chromeos LUCI <[email protected]> | Tue Oct 08 08:39:51 2024 |
| tree | 10d9951ea59d9f609bb221b38443899fdb3498a0 | |
| parent | 11d2586849402b5aab6bf4d3e7f81116cf9fc535 [diff] |
floss_patches land: Avoid redundant newlines when description is empty BUG=b:361231905 TEST=floss_patches land --cl_number 3298391, https://crrev.com/c/5914037 Change-Id: I16f155bd80e472b7e5d582cffe12c721b57c5257 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/bluetooth/+/5915433 Commit-Queue: Hsin-chen Chuang <[email protected]> Reviewed-by: Dean Liao <[email protected]> Tested-by: Hsin-chen Chuang <[email protected]>
diff --git a/tools/floss_patches b/tools/floss_patches index 4af05d7..a21911b 100755 --- a/tools/floss_patches +++ b/tools/floss_patches
@@ -800,12 +800,17 @@ test += line + "\n" else: description += line + "\n" + + # If description is not empty, append a blank line to separate it from the + # following "cherry-pick ... " line. + description = description.strip() + if description: + description += "\n\n" + cl_message = f"""\ floss UPSTREAM: {subject} -{description.strip()} - -(cherry-pick from https://r.android.com/{cl_number}) +{description}(cherry-pick from https://r.android.com/{cl_number}) {bug.strip() or 'BUG=None'} {test.strip() or 'TEST=CQ'}