[Dev OpenGP] [128] Indentation issues

[subversion@xxxxxxxxxxxxx]

Revision: 128
Author:   alband85
Date:     2009-03-27 03:03:48 +0100 (Fri, 27 Mar 2009)

Log Message:
-----------
Indentation issues

Modified Paths:
--------------
    trunk/src/bin/ogpdaemon


Modified: trunk/src/bin/ogpdaemon
===================================================================
--- trunk/src/bin/ogpdaemon	2009-03-27 02:02:14 UTC (rev 127)
+++ trunk/src/bin/ogpdaemon	2009-03-27 02:03:48 UTC (rev 128)
@@ -38,7 +38,7 @@
 		f.close()
 	except:
 		pass
-	
+
 	currentSOAs = core.pullSOAs(dn)
 	if currentSOAs != oldSOAs:
 		f = open(SOAS_FILE, 'w')
@@ -61,7 +61,7 @@
 		usage()
 		sys.exit(2)
 	loglevels=[logging.INFO, logging.WARNING, logging.DEBUG]
-	
+
 	loglevel=0
 	reload=False
 
@@ -71,10 +71,10 @@
 			usage()
 			sys.exit()
 		elif opt in ['-v', '--verbose']:
-				loglevel = loglevel + 1
+			loglevel = loglevel + 1
 		elif opt in ['-r', '--reload-conf']:
 			reload = True
-		
+
 	if loglevel > 2:
 		loglevel = 2
 	return (reload, loglevels[loglevel])	
@@ -134,7 +134,7 @@
 			logging.info("--reload-conf, so forcing conf installation...")
 		else:
 			logging.info("SOAs changed, installing conf...")
-	
+
 	requiredPlugins=core.getRequiredPlugins(dn)
 	for pluginName in requiredPlugins:
 		if pluginName != 'ogpdaemon': #skip ogpdaemon, because done before
@@ -155,8 +155,8 @@
 				if reload: 
 					print "\033[0;31mfailed\033[0m with %s." % sys.exc_info()[1]
 				logging.warning('Configuration installation for plugin %s failed with %s.' % (pluginName, sys.exc_info()[1]))
-						
 
+
 #initialization before fork
 #getting options from command line
 (reload, loglevel) = parse_opts()
@@ -165,25 +165,25 @@
 	#setting up logging
 	logging.basicConfig(filename=LOG_FILE, level=loglevel, format='%(asctime)s %(levelname)-8s %(message)s')
 	logging.info("OGP Daemon: Starting up...")
-	
+
 	#getting local conf
 	conf = load_conf()
-	
+
 	# Connection
 	core = OgpCore(conf['uri'], conf['dn'], conf['passwd'])
-	
+
 	#loading plugins
 	#should be done AFTER logging configuration
 	from ogp.plugins import *
-	
+
 	#getting remote conf
 	OgpDaemon  = Plugin.getPluginFromName('ogpdaemon')
 	ogpdaemon  = OgpDaemon(conf['dn'])
 	remoteConf = ogpdaemon.installConf()
 	totalConf = conf.copy()
 	for k in remoteConf:
-			totalConf[k] = remoteConf[k]
-	
+		totalConf[k] = remoteConf[k]
+
 	#if remoteConf overrides uri, dn or passwd, save conf and reinitialize core
 	for k in LOCAL_PARAMETERS:
 		if conf[k] != totalConf[k]:
@@ -191,7 +191,7 @@
 			del core
 			core = OgpCore(totalConf['uri'], totalConf['dn'], totalConf['passwd'])
 			break
-	
+
 	conf = totalConf
 except:
 	logging.error("OgpDaemon: startup failed with %s" % sys.exc_info()[1])