summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2010-11-24 18:35:48 +0100
committerSebastian Pipping <sebastian@pipping.org>2010-11-24 18:35:48 +0100
commit1bfc6ab419abb35c037a58272bc1509ebf7ea3fa (patch)
tree475f3c5bb644a17460e73735693d89684553c935 /layman/dbtools
parentClose file as early as possible (diff)
downloadrepositories-xml-format-1bfc6ab419abb35c037a58272bc1509ebf7ea3fa.tar.gz
repositories-xml-format-1bfc6ab419abb35c037a58272bc1509ebf7ea3fa.tar.bz2
repositories-xml-format-1bfc6ab419abb35c037a58272bc1509ebf7ea3fa.zip
Take conf/dev.conf into account
Diffstat (limited to 'layman/dbtools')
-rwxr-xr-xlayman/dbtools/gitoliteextractor.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/layman/dbtools/gitoliteextractor.py b/layman/dbtools/gitoliteextractor.py
index 0dbc344..3d77831 100755
--- a/layman/dbtools/gitoliteextractor.py
+++ b/layman/dbtools/gitoliteextractor.py
@@ -5,7 +5,7 @@
import sys
from optparse import OptionParser
-USAGE = 'Usage: %prog [--fixes-only] conf/user.conf conf/proj.conf bar/repositories.xml [baz/extended.xml]'
+USAGE = 'Usage: %prog [--fixes-only] conf/{dev,proj,user}.conf bar/repositories.xml [baz/extended.xml]'
parser = OptionParser(usage=USAGE)
parser.add_option('--fixes-only',
dest = 'fixes_only',
@@ -13,12 +13,12 @@ parser.add_option('--fixes-only',
action = 'store_true',
help = 'do not add entries that are missing completely')
(opts, args) = parser.parse_args()
-if len(args) not in (3, 4):
+if len(args) not in (4, 5):
parser.print_help()
sys.exit(1)
-gitolite_conf_locations = args[0:2]
-repositories_xml_location = args[2]
-extended_xml_location = (len(args) == 4) and args[3] or None
+gitolite_conf_locations = args[0:3]
+repositories_xml_location = args[3]
+extended_xml_location = (len(args) == 5) and args[4] or None
import xml.etree.ElementTree as ET
from ConfigParser import ConfigParser