aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBla Fasel <agx@sigxcpu.org>2014-08-11 11:09:32 +0200
committerBla Fasel <agx@sigxcpu.org>2014-08-11 11:09:32 +0200
commitc3258c19c6cfa291c8bebac1dae230f6e3ccca36 (patch)
tree1c1b4062ccf6eac334a5a5188d4bde35ced11e87
parent7cc96699f234303bc86908172fabcd6177b18571 (diff)
dch: Only modify the mainttrailer when --git-author is in useexperimental
-rw-r--r--gbp/scripts/dch.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index 4933388..126f3b7 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)