diff options
author | Guido Günther <agx@sigxcpu.org> | 2012-01-11 21:36:22 +0100 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2012-01-11 21:48:34 +0100 |
commit | cd410237326ccaf8250908ace65db01f47355170 (patch) | |
tree | 1e94702425f0b5c957776c824db06295cbd80ec4 | |
parent | 2d84986794d7edaaaca53d3e24390429a1bd327b (diff) |
buildpackage: Allow to pass pbuilder options
via commandline or gbp.conf
-rw-r--r-- | docs/manpages/git-buildpackage.sgml | 7 | ||||
-rw-r--r-- | gbp.conf | 6 | ||||
-rw-r--r-- | gbp/config.py | 3 | ||||
-rw-r--r-- | gbp/scripts/buildpackage.py | 3 |
4 files changed, 19 insertions, 0 deletions
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml index b6f02e1..2dbe85b 100644 --- a/docs/manpages/git-buildpackage.sgml +++ b/docs/manpages/git-buildpackage.sgml @@ -34,6 +34,7 @@ <arg><option>--git-dist=</option><replaceable>DIST</replaceable></arg> <arg><option>--git-arch=</option><replaceable>ARCH</replaceable></arg> <arg><option>--git-[no-]pbuilder-autoconf</option></arg> + <arg><option>--git-pbuilder-options</option></arg> <arg><option>--git-[no-]sign-tags</option></arg> <arg><option>--git-keyid=</option><replaceable>gpg-keyid</replaceable></arg> <arg><option>--git-posttag=</option><replaceable>command</replaceable></arg> @@ -171,6 +172,12 @@ manpage for details.</listitem> </varlistentry> <varlistentry> + <term><option>--git-pbuilder-options</option></term> + <listitem> + <para>Options to pass to pbuilder</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--git-verbose</option> </term> <listitem> @@ -46,6 +46,12 @@ #notify = off # Transparently handle submodules # submodules = True +# Wheter to use cowbuilder via git-pbuilder(1) +#pbuilder = True +# Which distribution to use with git-pbuilder +#dist = testing +# Options to pass to pbuilder when using git-pbuilder +#git-pbuilder-options = '--hookdir /etc/pbuilder/hooks' # Options only affecting git-import-orig [git-import-orig] diff --git a/gbp/config.py b/gbp/config.py index 030f116..5c2a2d9 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -125,6 +125,7 @@ class GbpOptionParser(OptionParser): 'submodules' : 'False', 'time-machine' : 1, 'pbuilder-autoconf' : 'True', + 'pbuilder-options': '' } help = { 'debian-branch': @@ -203,6 +204,8 @@ class GbpOptionParser(OptionParser): "don't try head commit only to apply the patch queue but look TIME_MACHINE commits back", 'pbuilder-autoconf': "Wheter to configure pbuilder automatically.", + 'pbuilder-options': + "Options to pass to pbuilder, default is '%(pbuilder-options)s'", } config_files = [ '/etc/git-buildpackage/gbp.conf', os.path.expanduser('~/.gbp.conf'), diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 8510ed1..8b98e0b 100644 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -418,6 +418,8 @@ def setup_pbuilder(options): os.environ['BUILDER'] = "qemubuilder" if not options.pbuilder_autoconf: os.environ['GIT_PBUILDER_AUTOCONF'] = "no" + if options.pbuilder_options: + os.environ['GIT_PBUILDER_OPTIONS'] = options.pbuilder_options def parse_args(argv, prefix): @@ -494,6 +496,7 @@ def parse_args(argv, prefix): cmd_group.add_config_file_option(option_name="dist", dest="pbuilder_dist") cmd_group.add_config_file_option(option_name="arch", dest="pbuilder_arch") cmd_group.add_boolean_config_file_option(option_name = "pbuilder-autoconf", dest="pbuilder_autoconf") + cmd_group.add_config_file_option(option_name="pbuilder-options", dest="pbuilder_options") export_group.add_config_file_option(option_name="export-dir", dest="export_dir", type="path", help="before building the package export the source into EXPORT_DIR, default is '%(export-dir)s'") export_group.add_config_file_option("export", dest="export", |