From c3258c19c6cfa291c8bebac1dae230f6e3ccca36 Mon Sep 17 00:00:00 2001 From: Bla Fasel Date: Mon, 11 Aug 2014 11:09:32 +0200 Subject: dch: Only modify the mainttrailer when --git-author is in use --- gbp/scripts/dch.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py index 49333882..126f3b77 100644 --- a/gbp/scripts/dch.py +++ b/gbp/scripts/dch.py @@ -89,11 +89,12 @@ def fixup_section(repo, use_git_author, options, dch_options): else: gbp.log.debug("Snapshot enabled: do not fixup options in header") - for opt in mainttrailer_opts: - if opt in dch_options: - break - else: - opts.append(mainttrailer_opts[0]) + if use_git_author: + for opt in mainttrailer_opts: + if opt in dch_options: + break + else: + opts.append(mainttrailer_opts[0]) ChangeLog.spawn_dch(msg='', author=author, email=email, dch_options=dch_options+opts) -- cgit v1.2.3