summaryrefslogtreecommitdiffstats
path: root/src/sbin/bcfg2-query
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2007-12-31 11:21:10 +0000
committerNarayan Desai <desai@mcs.anl.gov>2007-12-31 11:21:10 +0000
commitef5051726a3aa1f0192bd8d99c5c5b1ee9f067af (patch)
tree57bf0854d95c18cced379921657f746ad5faab04 /src/sbin/bcfg2-query
parent104a1e27cee2d5524460d26c83d3e920cd88b2e9 (diff)
downloadbcfg2-ef5051726a3aa1f0192bd8d99c5c5b1ee9f067af.tar.gz
bcfg2-ef5051726a3aa1f0192bd8d99c5c5b1ee9f067af.tar.bz2
bcfg2-ef5051726a3aa1f0192bd8d99c5c5b1ee9f067af.zip
Switch over to more Options usage and complete tests (everything appears to work now)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4142 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin/bcfg2-query')
-rwxr-xr-xsrc/sbin/bcfg2-query12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sbin/bcfg2-query b/src/sbin/bcfg2-query
index 46d4fab3c..3f0209192 100755
--- a/src/sbin/bcfg2-query
+++ b/src/sbin/bcfg2-query
@@ -1,10 +1,13 @@
#!/usr/bin/python
-# FIXME add -C <configfile> support
-
import lxml.etree, sys, ConfigParser
-from Bcfg2.Settings import settings
+CP = ConfigParser.ConfigParser()
+CP.read(['/etc/bcfg2.conf'])
+try:
+ prefix = CP.get('server', 'repository')
+except:
+ prefix = "/var/lib/bcfg2"
if len(sys.argv) < 2:
print "Usage bcfg2-query -d|u|p <profile name>"
@@ -17,9 +20,6 @@ if len(sys.argv) < 2:
print "\t -a\t shows all clients"
sys.exit(1)
-prefix = settings.SERVER_REPOSITORY
-
-
xml = lxml.etree.parse('%s/Metadata/clients.xml'%prefix)
if '-p' in sys.argv:
profile = sys.argv[sys.argv.index('-p') + 1]