From eac52c270b8b3b10e461bc46502b64c5f898bd7d Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Wed, 7 Oct 2009 14:46:08 +0000
Subject: Pylint/PEP 8 Code cleanups

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5477 ce84e21b-d406-0410-9b95-82705330c041
---
 src/lib/Server/Admin/Init.py | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/lib/Server/Admin/Init.py')

diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py
index c12fcf9a8..9fc2a23fe 100644
--- a/src/lib/Server/Admin/Init.py
+++ b/src/lib/Server/Admin/Init.py
@@ -75,14 +75,14 @@ os_list = [
           ]
 
 # Complete list of plugins
-plugin_list = ['Account', 'Base', 'Bundler', 'Cfg', 
-             'Decisions', 'Deps', 'Metadata', 'Packages', 
-             'Pkgmgr', 'Probes', 'Properties', 'Rules', 
-             'Snapshots', 'SSHbase', 'Statistics', 'Svcmgr', 
+plugin_list = ['Account', 'Base', 'Bundler', 'Cfg',
+             'Decisions', 'Deps', 'Metadata', 'Packages',
+             'Pkgmgr', 'Probes', 'Properties', 'Rules',
+             'Snapshots', 'SSHbase', 'Statistics', 'Svcmgr',
              'TCheetah', 'TGenshi']
 
 # Default list of plugins to use
-default_plugins = ['SSHbase', 'Cfg', 'Pkgmgr', 'Rules', 
+default_plugins = ['SSHbase', 'Cfg', 'Pkgmgr', 'Rules',
                 'Metadata', 'Base', 'Bundler']
 
 def gen_password(length):
@@ -188,13 +188,13 @@ class Init(Bcfg2.Server.Admin.Mode):
                 "(without echoing; leave blank for a random): ").strip()
         if len(newpassword) != 0:
             self.password = newpassword
-        
+
     def _prompt_server(self):
         """Ask for the server name"""
-        newserver = raw_input( "Input the server location [%s]: " % self.server_uri)
+        newserver = raw_input("Input the server location [%s]: " % self.server_uri)
         if newserver != '':
             self.server_uri = newserver
-        
+
     def _prompt_groups(self):
         """Create the groups.xml file"""
         prompt = '''Input base Operating System for clients:\n'''
@@ -241,15 +241,15 @@ class Init(Bcfg2.Server.Admin.Mode):
         '''Setup a new repo'''
         # Create the contents of the configuration file
         keypath = os.path.dirname(os.path.abspath(self.configfile))
-        confdata = config % ( 
-                        self.repopath, 
+        confdata = config % (
+                        self.repopath,
                         ','.join(self.opts['plugins']),
-                        self.opts['sendmail'], 
+                        self.opts['sendmail'],
                         self.opts['proto'],
-                        self.password, 
-                        keypath, 
-                        keypath, 
-                        self.server_uri 
+                        self.password,
+                        keypath,
+                        keypath,
+                        self.server_uri
                     )
 
         # Create the configuration file and SSL key
@@ -257,7 +257,7 @@ class Init(Bcfg2.Server.Admin.Mode):
         create_key(keypath)
 
         # Create the repository
-        path = "%s/%s" % (self.repopath, 'etc') 
+        path = "%s/%s" % (self.repopath, 'etc')
         os.makedirs(path)
         self._init_plugins()
         print "Repository created successfuly in %s" % (self.repopath)
-- 
cgit v1.2.3-1-g7c22