aboutsummaryrefslogtreecommitdiff
path: root/git_buildpackage/config.py
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2006-12-08 16:32:32 +0100
committerGuido Guenther <agx@bogon.sigxcpu.org>2006-12-08 16:32:32 +0100
commit9e54f169eae8db3984302171d7772795deac9513 (patch)
tree83b2a252b55f35f57b18ba7c402383aa77e074a1 /git_buildpackage/config.py
parent960385597d124c0881a5779448beb4c0b6d85c9a (diff)
support signed tagsdebian/0.2.15
Diffstat (limited to 'git_buildpackage/config.py')
-rw-r--r--git_buildpackage/config.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/git_buildpackage/config.py b/git_buildpackage/config.py
index 3a2c69d..f909b2f 100644
--- a/git_buildpackage/config.py
+++ b/git_buildpackage/config.py
@@ -22,9 +22,12 @@ class GBPOptionParser(OptionParser):
@cvar config_files: list of config files we parse
@type config_files: list
"""
- defaults={ 'builder': 'debuild',
+ defaults={ 'builder' : 'debuild',
'debian-branch' : 'debian',
'upstream-branch' : 'upstream',
+ 'upstream-branch' : 'upstream',
+ 'sign-tags' : '', # empty means False
+ 'keyid' : '',
}
config_files=['/etc/git-buildpackage/gbp.conf',
os.path.expanduser('~/.gbp.conf'),
@@ -45,7 +48,7 @@ class GBPOptionParser(OptionParser):
OptionParser.__init__(self, usage=usage)
- def add_config_file_option(self, option_name, dest, help):
+ def add_config_file_option(self, option_name, dest, help, **kwargs):
"""
set a option for the command line parser, the default is read from the config file
@var option_name: name of the option
@@ -56,6 +59,6 @@ class GBPOptionParser(OptionParser):
@type help: string
"""
OptionParser.add_option(self,"--%s%s" % (self.prefix, option_name), dest=dest,
- default=self.config[option_name], help=help % self.config)
-
+ default=self.config[option_name],
+ help=help % self.config, **kwargs)