From 893e127aa9acd302bb2d9be0a00cce1c57e46e75 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 4 Jul 2016 12:14:33 +0200
Subject: Allow to configure additional components via gbp.conf

---
 gbp/config.py               | 5 ++++-
 gbp/scripts/buildpackage.py | 4 ++--
 gbp/scripts/import_orig.py  | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gbp/config.py b/gbp/config.py
index 52bf03e..4b5fb25 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -170,6 +170,7 @@ class GbpOptionParser(OptionParser):
                  'commit': 'False',
                  'upstream-vcs-tag': '',
                  'rollback': 'True',
+                 'component': [],
              }
     help = {
              'debian-branch':
@@ -330,6 +331,8 @@ class GbpOptionParser(OptionParser):
                   "commit changes after export, Default is '%(commit)s'",
               'rollback':
                   "Rollback repository changes when encountering an error",
+              'component':
+                  'component name for additional tarballs',
            }
 
     def_config_files = {'/etc/git-buildpackage/gbp.conf': 'system',
@@ -338,7 +341,7 @@ class GbpOptionParser(OptionParser):
                         '%(top_dir)s/debian/gbp.conf':    'debian',
                         '%(git_dir)s/gbp.conf':           None}
 
-    list_opts = ['filter']
+    list_opts = ['filter', 'component']
 
     @classmethod
     def get_config_files(klass, no_local=False):
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index 22d6daa..dab45e8 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -543,8 +543,8 @@ def build_parser(name, prefix=None):
                       help="Compression type, default is '%(compression)s'")
     orig_group.add_config_file_option(option_name="compression-level", dest="comp_level",
                       help="Compression level, default is '%(compression-level)s'")
-    orig_group.add_option("--git-component", action="append", metavar='COMPONENT',
-                          dest="components", help="subtarsball to generate, can be given multiple times", default=[])
+    orig_group.add_config_file_option("component", action="append", metavar='COMPONENT',
+                                      dest="components")
     branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch")
     branch_group.add_config_file_option(option_name="debian-branch", dest="debian_branch")
     branch_group.add_boolean_config_file_option(option_name = "ignore-branch", dest="ignore_branch")
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py
index c2d484a..82c2f42 100644
--- a/gbp/scripts/import_orig.py
+++ b/gbp/scripts/import_orig.py
@@ -410,8 +410,8 @@ def build_parser(name):
                       dest="import_msg")
     import_group.add_boolean_config_file_option(option_name="symlink-orig",
                                                 dest="symlink_orig")
-    import_group.add_option("--component", action="append", metavar='COMPONENT',
-                            dest="components", help="additional component to import, can be given multiple times", default=[])
+    import_group.add_config_file_option("component", action="append", metavar='COMPONENT',
+                                        dest="components")
     cmd_group.add_config_file_option(option_name="postimport", dest="postimport")
 
 
-- 
cgit v1.2.3