1 |
On 09/30/2018 09:27 AM, Mike Gilbert wrote: |
2 |
> This makes for a cleaner looking message when multiple people add their |
3 |
> SOB during a review process. |
4 |
> |
5 |
> Signed-off-by: Mike Gilbert <floppym@g.o> |
6 |
> --- |
7 |
> repoman/lib/repoman/actions.py | 7 ++++--- |
8 |
> 1 file changed, 4 insertions(+), 3 deletions(-) |
9 |
> |
10 |
> diff --git a/repoman/lib/repoman/actions.py b/repoman/lib/repoman/actions.py |
11 |
> index 3cf6f7081..4980f11eb 100644 |
12 |
> --- a/repoman/lib/repoman/actions.py |
13 |
> +++ b/repoman/lib/repoman/actions.py |
14 |
> @@ -441,9 +441,6 @@ the whole commit message to abort. |
15 |
> bug = urlunsplit(('https',) + purl[1:]) |
16 |
> commit_footer += "\n%s: %s" % (tag, bug) |
17 |
> |
18 |
> - if dco_sob: |
19 |
> - commit_footer += "\nSigned-off-by: %s" % (dco_sob, ) |
20 |
> - |
21 |
> # Use new footer only for git (see bug #438364). |
22 |
> if self.vcs_settings.vcs in ["git"]: |
23 |
> commit_footer += "\nPackage-Manager: Portage-%s, Repoman-%s" % ( |
24 |
> @@ -468,6 +465,10 @@ the whole commit message to abort. |
25 |
> else: |
26 |
> commit_footer += ", unsigned Manifest commit" |
27 |
> commit_footer += ")" |
28 |
> + |
29 |
> + if dco_sob: |
30 |
> + commit_footer += "\nSigned-off-by: %s" % (dco_sob, ) |
31 |
> + |
32 |
> return commit_footer |
33 |
> |
34 |
> |
35 |
> |
36 |
|
37 |
Both patches look good. Please merge. |
38 |
-- |
39 |
Thanks, |
40 |
Zac |