diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2007-10-16 19:58:09 +0200 |
|---|---|---|
| committer | Guido Guenther <agx@sigxcpu.org> | 2007-10-16 20:02:59 +0200 |
| commit | bc2deadde06fce6b40359b43370ed3d65d177490 (patch) | |
| tree | a24f7f7c176cae017e7f21d9ec85a542e3899f8f /gbp | |
| parent | 09751bce5528c0803006bf8261e66ee9e5956f9d (diff) | |
| download | git-buildpackage-bc2deadde06fce6b40359b43370ed3d65d177490.tar.gz git-buildpackage-bc2deadde06fce6b40359b43370ed3d65d177490.tar.bz2 git-buildpackage-bc2deadde06fce6b40359b43370ed3d65d177490.zip | |
Parse .gbp.conf in the repo dir (Closes: #426009)
Diffstat (limited to 'gbp')
| -rw-r--r-- | gbp/config.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gbp/config.py b/gbp/config.py index ba2ed345..694aceb7 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -36,9 +36,10 @@ class GbpOptionParser(OptionParser): 'snapshot-number' : 'snapshot + 1', 'git-log' : '--no-merges', } - config_files=['/etc/git-buildpackage/gbp.conf', - os.path.expanduser('~/.gbp.conf'), - '.git/gbp.conf' ] + config_files=[ '/etc/git-buildpackage/gbp.conf', + os.path.expanduser('~/.gbp.conf'), + '.gbp.conf', + '.git/gbp.conf' ] def __parse_config_files(self): """parse the possible config files and set appropriate values default values""" |