From bc1ee763eef9caa66b1c4ab846c6884515dc93c4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@bernewireless.net>
Date: Tue, 14 Dec 2010 00:54:57 +0100
Subject: Plugins: Ordered defaults plugins (cherry picked from commit
 99bbe3f9d130bf9939489c4cd959373b1f3ce43f)

---
 src/lib/Server/Admin/Init.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py
index 1f00ce2a0..3a461681b 100644
--- a/src/lib/Server/Admin/Init.py
+++ b/src/lib/Server/Admin/Init.py
@@ -105,8 +105,15 @@ plugin_list = [
                 ]
 
 # Default list of plugins to use
-default_plugins = ['SSHbase', 'Cfg', 'Pkgmgr', 'Rules',
-                'Metadata', 'Base', 'Bundler']
+default_plugins = [
+                'Base',
+                'Bundler'
+                'Cfg',
+                'Metadata',
+                'Pkgmgr',
+                'Rules',
+                'SSHbase'
+                ]
 
 def gen_password(length):
     """Generates a random alphanumeric password with length characters."""
@@ -125,7 +132,7 @@ def create_key(hostname, keypath, certpath):
     os.chmod(keypath, 0600)
 
 def create_conf(confpath, confdata):
-    # don't overwrite existing bcfg2.conf file
+    # Don't overwrite existing bcfg2.conf file
     if os.path.exists(confpath):
         result = raw_input("\nWarning: %s already exists. "
                     "Overwrite? [y/N]: " % confpath)
@@ -253,7 +260,7 @@ class Init(Bcfg2.Server.Admin.Mode):
                     plugin = plugin.strip()
                     if not plugin in plugin_list:
                         plugins_are_valid = False
-                        print "ERROR: plugin %s not recognized" % plugin
+                        print "ERROR: Plugin %s not recognized" % plugin
                 if plugins_are_valid:
                     break
 
-- 
cgit v1.2.3-1-g7c22