diff options
author | Guido Günther <agx@sigxcpu.org> | 2011-12-26 12:13:49 +0100 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2011-12-26 13:59:51 +0100 |
commit | 58978c5248c7410f3f244af4a8dbbd97a5ca25ff (patch) | |
tree | 81223f775eab97289d5b955f1690533a5f1d8fb7 /gbp | |
parent | 248b5501ed8a4fc40ae326a634cb7255c487126e (diff) |
Add --[no-]-pbuilder-autoconf
to pass GIT_PBUILDER_AUTOCONF=no to git-pbuilder.
Diffstat (limited to 'gbp')
-rw-r--r-- | gbp/config.py | 3 | ||||
-rw-r--r-- | gbp/scripts/buildpackage.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gbp/config.py b/gbp/config.py index 92ae1ae3..78c88cac 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -124,6 +124,7 @@ class GbpOptionParser(OptionParser): 'create-missing-branches': 'False', 'submodules' : 'False', 'time-machine' : 1, + 'pbuilder-autoconf' : 'True', } help = { 'debian-branch': @@ -200,6 +201,8 @@ class GbpOptionParser(OptionParser): "hook run after a successful import, default is '%(postimport)s'", 'time-machine': "don't try head commit only to apply the patch queue but look TIME_MACHINE commits back", + 'pbuilder-autoconf': + "Wheter to configure pbuilder automatically.", } 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 922b89eb..911552d2 100644 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -405,6 +405,8 @@ def setup_pbuilder(options): os.environ['ARCH'] = options.pbuilder_arch if options.use_qemubuilder: os.environ['BUILDER'] = "qemubuilder" + if not options.pbuilder_autoconf: + os.environ['GIT_PBUILDER_AUTOCONF'] = "no" def parse_args(argv, prefix): @@ -480,6 +482,7 @@ def parse_args(argv, prefix): cmd_group.add_boolean_config_file_option(option_name="qemubuilder", dest="use_qemubuilder") 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") 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", |