From 720811e98fc2c7e61af2b24bc1112f0c042f938b Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Wed, 30 Dec 2009 18:17:35 +0000
Subject: 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
---
 src/lib/Client/Tools/YUMng.py    |  2 +-
 src/lib/Server/Admin/__init__.py |  2 +-
 src/sbin/bcfg2                   | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py
index 4ce184ced..62f680caf 100644
--- a/src/lib/Client/Tools/YUMng.py
+++ b/src/lib/Client/Tools/YUMng.py
@@ -235,7 +235,7 @@ class YUMng(Bcfg2.Client.Tools.RPMng.RPMng):
                 installed_instances = []
                 for inst in install_pkgs:
                     pkg_arg = build_yname(self.instance_status[inst].get('pkg').get('name'), inst)
-    
+
                     cmdrc, output = self.cmd.run(pkgtool % pkg_arg)
                     if cmdrc == 0:
                         installed_instances.append(inst)
diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Server/Admin/__init__.py
index ecd2bd5b6..8ce3472fb 100644
--- a/src/lib/Server/Admin/__init__.py
+++ b/src/lib/Server/Admin/__init__.py
@@ -40,7 +40,7 @@ class Mode(object):
     def errExit(self, emsg):
         print emsg
         raise SystemExit(1)
-        
+
     def get_repo_path(self):
         '''return repository path'''
         return self.cfp.get('server', 'repository')
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()
-- 
cgit v1.2.3-1-g7c22