summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-12-30 18:17:35 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-12-30 18:17:35 +0000
commit720811e98fc2c7e61af2b24bc1112f0c042f938b (patch)
treedb6be835d2b3bca0c5169e7ba58228b9efb02276 /src/sbin
parent70c48b2c06aba1dd8ad500b6dfc5c895a8f853f7 (diff)
downloadbcfg2-720811e98fc2c7e61af2b24bc1112f0c042f938b.tar.gz
bcfg2-720811e98fc2c7e61af2b24bc1112f0c042f938b.tar.bz2
bcfg2-720811e98fc2c7e61af2b24bc1112f0c042f938b.zip
Code cleanups
Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5648 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg210
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 1075cfc86..293f88e9f 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -57,7 +57,7 @@ class Client:
'remove': Bcfg2.Options.CLIENT_REMOVE,
'help': Bcfg2.Options.HELP,
'setup': Bcfg2.Options.CFILE,
- 'server': Bcfg2.Options.SERVER_LOCATION,
+ 'server': Bcfg2.Options.SERVER_LOCATION,
'user': Bcfg2.Options.CLIENT_USER,
'password': Bcfg2.Options.SERVER_PASSWORD,
'retries': Bcfg2.Options.CLIENT_RETRIES,
@@ -72,7 +72,7 @@ class Client:
'key' : Bcfg2.Options.CLIENT_KEY,
'certificate' : Bcfg2.Options.CLIENT_CERT,
'ca' : Bcfg2.Options.CLIENT_CA,
- 'serverCN' : Bcfg2.Options.CLIENT_SCNS,
+ 'serverCN' : Bcfg2.Options.CLIENT_SCNS,
}
self.setup = Bcfg2.Options.OptionParser(optinfo)
@@ -135,7 +135,7 @@ class Client:
'''Signal a fatal error'''
self.logger.error("Fatal error: %s" % (message))
raise SystemExit(1)
-
+
def run(self):
''' Perform client execution phase '''
times = {}
@@ -243,7 +243,7 @@ class Client:
except Bcfg2.Client.XML.ParseError, syntax_error:
self.fatal_error("the configuration could not be parsed: %s" %
(syntax_error))
- return(1)
+ return(1)
times['config_parse'] = time.time()
@@ -280,7 +280,7 @@ class Client:
os.remove(LOCKFILE)
except OSError:
self.logger.error("Failed to unlock lockfile %s" % lockfile.name)
-
+
if not self.setup['file']:
# upload statistics
feedback = self.tools.GenerateStats()