diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-21 11:21:40 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-21 11:21:40 -0400 |
| commit | e88008fef62328953b60b7670a69f517eae2ea6f (patch) | |
| tree | 36d096cf91819c663d34f7c9d3834dfd9e7779ca /src/sbin | |
| parent | cf1f4029b97f5e3100a7f9c31308a2e8b82657be (diff) | |
| download | bcfg2-e88008fef62328953b60b7670a69f517eae2ea6f.tar.gz bcfg2-e88008fef62328953b60b7670a69f517eae2ea6f.tar.bz2 bcfg2-e88008fef62328953b60b7670a69f517eae2ea6f.zip | |
made SSLCA respect info.xml
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-info | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index e09b7ed87..70e327ef3 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -108,11 +108,13 @@ def displayTrace(trace, num=80, sort=('time', 'calls')): class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core): """Main class for bcfg2-info.""" - def __init__(self, repo, plgs, passwd, encoding, event_debug, filemonitor='default'): + def __init__(self, repo, plgs, passwd, encoding, event_debug, + cfile='/etc/bcfg2.conf', filemonitor='default'): cmd.Cmd.__init__(self) try: Bcfg2.Server.Core.Core.__init__(self, repo, plgs, passwd, - encoding, filemonitor=filemonitor) + encoding, cfile=cfile, + filemonitor=filemonitor) if event_debug: self.fam.debug = True except Bcfg2.Server.Core.CoreInitError: @@ -590,12 +592,15 @@ if __name__ == '__main__': prof = profile.Profile() loop = prof.runcall(infoCore, setup['repo'], setup['plugins'], setup['password'], setup['encoding'], - setup['event debug'], setup['filemonitor']) + setup['event debug'], cfile=setup['configfile'], + filemonitor=setup['filemonitor']) displayTrace(prof) else: if setup['profile']: print("Profiling functionality not available.") loop = infoCore(setup['repo'], setup['plugins'], setup['password'], - setup['encoding'], setup['event debug'], setup['filemonitor']) + setup['encoding'], setup['event debug'], + cfile=setup['configfile'], + filemonitor=setup['filemonitor']) loop.Run(setup['args']) |