summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Gogolok <gogo@cs.uni-sb.de>2007-12-31 11:41:11 +0000
committerRobert Gogolok <gogo@cs.uni-sb.de>2007-12-31 11:41:11 +0000
commitde51ebac57f438b15dd7f05403ff4b38c7c79b8c (patch)
treeed5e93938ca4e607e0d3d1381a51404453fbd4d7
parentef5051726a3aa1f0192bd8d99c5c5b1ee9f067af (diff)
downloadbcfg2-de51ebac57f438b15dd7f05403ff4b38c7c79b8c.tar.gz
bcfg2-de51ebac57f438b15dd7f05403ff4b38c7c79b8c.tar.bz2
bcfg2-de51ebac57f438b15dd7f05403ff4b38c7c79b8c.zip
fix syntax; adjust SSETUP to common style
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4143 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Admin/Init.py2
-rwxr-xr-xsrc/sbin/bcfg2-server12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py
index d057fc1ff..7a18c9287 100644
--- a/src/lib/Server/Admin/Init.py
+++ b/src/lib/Server/Admin/Init.py
@@ -103,7 +103,7 @@ class Init(Bcfg2.Server.Admin.Mode):
keypath = os.path.dirname(os.path.abspath(settings.CONFIG_FILE))
confdata = config % (
repo, opts['struct'], opts['gens'],
- opts['sendmail'], opts['proto']
+ opts['sendmail'], opts['proto'],
password, keypath, server_uri
)
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 4c941e0ac..d2fdfa6ab 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -182,19 +182,19 @@ if __name__ == '__main__':
'configfile': Bcfg2.Options.CFILE,
}
- SSETUP = Bcfg2.Options.OptionParser(OPTINFO)
- SSETUP.parse(sys.argv[1:])
- print SSETUP
+ setup = Bcfg2.Options.OptionParser(OPTINFO)
+ setup.parse(sys.argv[1:])
+ print setup
level = 0
if '-D' in sys.argv:
Bcfg2.Logging.setup_logging('bcfg2-server', to_console=False, level=level)
else:
Bcfg2.Logging.setup_logging('bcfg2-server', level=level)
- if SSETUP['daemon']:
- Bcfg2.Daemon.daemonize(SSETUP['daemon'])
+ if setup['daemon']:
+ Bcfg2.Daemon.daemonize(setup['daemon'])
try:
- BSERV = Bcfg2Serv(SSETUP)
+ BSERV = Bcfg2Serv(setup)
except SetupError:
raise SystemExit, 1
while not BSERV.shut: