Gentoo Archives: gentoo-portage-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCH] repoman: always add a newline if the message body is one line
Date: Sat, 14 Jan 2017 16:58:45
Message-Id: 20170114165838.29029-1-floppym@gentoo.org
1 The second line in a git commit message is supposed to be blank.
2
3 Before:
4 dev-libs/libfoo: fix another bug
5 Package-Manager: Portage-2.3.3, Repoman-2.3.1
6
7 After:
8 dev-libs/libfoo: fix another bug
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11 ---
12 repoman/pym/repoman/actions.py | 5 +++--
13 1 file changed, 3 insertions(+), 2 deletions(-)
14
15 diff --git a/repoman/pym/repoman/actions.py b/repoman/pym/repoman/actions.py
16 index 58b00d494..82c76b2fb 100644
17 --- a/repoman/pym/repoman/actions.py
18 +++ b/repoman/pym/repoman/actions.py
19 @@ -128,8 +128,9 @@ class Actions(object):
20 myupdates, mymanifests, myremoved, mychanged, myautoadd,
21 mynew, commitmessage)
22
23 - lastline = commitmessage.splitlines()[-1]
24 - if not ':' in lastline:
25 + lines = commitmessage.splitlines()
26 + lastline = lines[-1]
27 + if len(lines) == 1 or not ':' in lastline:
28 commitmessage += '\n'
29
30 commit_footer = self.get_commit_footer()
31 --
32 2.11.0

Replies