diff options
| author | Guido Günther <agx@sigxcpu.org> | 2008-10-22 15:59:13 +0200 |
|---|---|---|
| committer | Guido Guenther <agx@sigxcpu.org> | 2008-10-22 15:59:13 +0200 |
| commit | 8b15994277805a3e3d6b1058f07113aef3c2e1ab (patch) | |
| tree | de1ec08748586d48ad4cd629496e38870e36bb3b | |
| parent | b6c407ba255d90eab6b849d84a6d4119c1a15b44 (diff) | |
allow for another config file $REPO/debian/gbp.conf
the advantage over $REPO/.gbp.conf is that one can keep everything
packaging related below debian/. Thanks to Sean Finney.
Closes: #502253
| -rw-r--r-- | docs/chapters/cfgfile.sgml | 4 | ||||
| -rw-r--r-- | docs/manpages/man.conffiles.sgml | 5 | ||||
| -rw-r--r-- | gbp/config.py | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/docs/chapters/cfgfile.sgml b/docs/chapters/cfgfile.sgml index 6aa2f10d..3590a175 100644 --- a/docs/chapters/cfgfile.sgml +++ b/docs/chapters/cfgfile.sgml @@ -15,6 +15,10 @@ <listitem><para>per repository/branch configuration</para></listitem> </varlistentry> <varlistentry> + <term>debian/gbp.conf</term> + <listitem><para>per repository/branch configuration</para></listitem> + </varlistentry> + <varlistentry> <term>.git/gbp.conf</term> <listitem><para>per (local) repository configuration</para></listitem> </varlistentry> diff --git a/docs/manpages/man.conffiles.sgml b/docs/manpages/man.conffiles.sgml index 29bff99e..c94253d8 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>per branch configuration, can be published with the + repository</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 c915c99c..2235f345 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -48,6 +48,7 @@ class GbpOptionParser(OptionParser): config_files = [ '/etc/git-buildpackage/gbp.conf', os.path.expanduser('~/.gbp.conf'), '.gbp.conf', + 'debian/gbp.conf', '.git/gbp.conf' ] def __parse_config_files(self): |