as requested in #502253. this allows to keep all debian-specific changes (including gbp.conf) in the debian subdir, which provides both aesthetic and technical advantages.
the file was added to the end of the list of locations searched, so it
should hopefully not intefere with anyone who is using any of the previous
locations.
---
docs/manpages/man.conffiles.sgml | 5 +++++
gbp/config.py | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/docs/manpages/man.conffiles.sgml b/docs/manpages/man.conffiles.sgml
index 29bff99..a64e2cb 100644
--- a/docs/manpages/man.conffiles.sgml
+++ b/docs/manpages/man.conffiles.sgml
@@ -16,6 +16,11 @@
repository</para></listitem>
</varlistentry>
<varlistentry>
+ <term>debian/gbp.conf</term>
+ <listitem><para>same as .gbp.conf, but allows to keep all debian-specific
+ changes in the ./debian sub-directory</para></listitem>
+ </varlistentry>
+ <varlistentry>
<term>.git/gbp.conf</term>
<listitem><para>per repository configuration</para></listitem>
</varlistentry>
diff --git a/gbp/config.py b/gbp/config.py
index c915c99..d2a7b35 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -48,7 +48,8 @@ class GbpOptionParser(OptionParser):
config_files = [ '/etc/git-buildpackage/gbp.conf',
os.path.expanduser('~/.gbp.conf'),
'.gbp.conf',
- '.git/gbp.conf' ]
+ '.git/gbp.conf',
+ 'debian/gbp.conf' ]
def __parse_config_files(self):
"""parse the possible config files and set appropriate values default
values"""
--
1.5.6.5
signature.asc
Description: Digital signature
