aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2008-04-26 02:29:01 +0200
committerGuido Guenther <agx@sigxcpu.org>2008-04-26 02:36:19 +0200
commit2e2c476773614fdef330ce91c862b06964b48662 (patch)
tree1553a049e04ee36b8d0442047b97f73043d8f569
parent720ad47a7bd6b44f5fb74409ca5770e3f134df0a (diff)
make ignore-new a config file option
Closes: #466900
-rw-r--r--gbp.conf1
-rwxr-xr-xgit-buildpackage4
2 files changed, 3 insertions, 2 deletions
diff --git a/gbp.conf b/gbp.conf
index b9a65bbb..9acdc4d7 100644
--- a/gbp.conf
+++ b/gbp.conf
@@ -27,6 +27,7 @@
# use this for more svn-buildpackage like behaviour:
#export-dir = ../build-area/
#tarball-dir = ../tarballs/
+#ignore-new = True
# Options only affecting git-import-orig
[git-import-orig]
diff --git a/git-buildpackage b/git-buildpackage
index 6e843cc2..af7822c6 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -137,8 +137,8 @@ def main(argv):
parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix=prefix)
- parser.add_option("--git-ignore-new", action="store_true", dest="ignore_new", default=False,
- help="build with uncommited changes in the source tree")
+ parser.add_config_file_option(option_name = "ignore-new", dest="ignore_new",
+ help="build with uncommited changes in the source tree", action="store_true")
parser.add_option("--git-verbose", action="store_true", dest="verbose", default=False,
help="verbose command execution")
parser.add_config_file_option(option_name="builder", dest="builder",