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.

Change-Id: I0fb1b5bb99aa8f622a7c52316e9320973333bad5
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/gbp/config.py b/gbp/config.py
index 2d9c8fdd536cb8d9542e5277a798b2e41d9ce523..a2c28defc8a1672b77b9d9694120bf8e86ef150e 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -123,7 +123,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',

diff --git a/gbp/dch.py b/gbp/dch.py
index dc0149c387c81ddb3f68ec9084502fb1781687e5..f983234fa9c6c386910436154c96a336363df585 100644 (file)
--- a/gbp/dch.py
+++ b/gbp/dch.py
@@ -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):