diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-06-06 10:22:31 +0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-12-05 15:51:56 +0100 |
| commit | 01470e125483d48d3257148ef96f73ad8ed43469 (patch) | |
| tree | 30f01b662203fa0a71ccd05a6aafddb450f8508c /gbp | |
| parent | 76739f8000d0d1b66ace201e105e3c3c2cd6357f (diff) | |
gbp-dch: fix handling of the '--meta' option
Make it effective again - previously it was totally ignored. Also,
change it's default value to True to match the current behavior.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp')
| -rw-r--r-- | gbp/config.py | 2 | ||||
| -rw-r--r-- | gbp/dch.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gbp/config.py b/gbp/config.py index 174eba4..63c11cb 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -119,7 +119,7 @@ class GbpOptionParser(OptionParser): 'tarball-dir' : '', 'ignore-new' : 'False', 'ignore-branch' : 'False', - 'meta' : 'False', + 'meta' : 'True', 'meta-closes' : 'Closes|LP', 'full' : 'False', 'id-length' : '0', @@ -115,8 +115,11 @@ def format_changelog_entry(commit_info, options, last_commit=False): if options.idlen: entry[0] = '[%s] ' % commitid[0:options.idlen] + entry[0] - (bts_cmds, body) = extract_bts_cmds(body, options) - (thanks, body) = extract_thanks_info(body, options) + bts_cmds = {} + thanks = [] + if options.meta: + (bts_cmds, body) = extract_bts_cmds(body, options) + (thanks, body) = extract_thanks_info(body, options) body = filter_ignore_rx_matches(body, options) if 'full' in git_dch_cmds or (options.full and not 'short' in git_dch_cmds): |