From a17b93a28cecb150c48796799a00ad8ba5bdeca0 Mon Sep 17 00:00:00 2001
From: JF Ding <jian-feng.ding@intel.com>
Date: Fri, 19 Aug 2011 21:28:35 +0800
Subject: [PATCH] change the path of pykickstart module

---
 mic/__init__.py                                    |  3 +++
 mic/configmgr.py                                   | 12 +++++-----
 mic/imager/baseimager.py                           |  4 ++--
 mic/imager/loop.py                                 |  3 +--
 mic/kickstart/__init__.py                          | 27 ++++++++++------------
 .../handlers => pykickstart}/__init__.py           |  0
 mic/{kickstart => }/pykickstart/base.py            |  0
 .../pykickstart/commands/__init__.py               |  0
 .../pykickstart/commands/authconfig.py             |  0
 .../pykickstart/commands/autopart.py               |  0
 .../pykickstart/commands/autostep.py               |  0
 .../pykickstart/commands/bootloader.py             |  0
 .../pykickstart/commands/clearpart.py              |  0
 mic/{kickstart => }/pykickstart/commands/device.py |  0
 .../pykickstart/commands/deviceprobe.py            |  0
 .../pykickstart/commands/displaymode.py            |  0
 mic/{kickstart => }/pykickstart/commands/dmraid.py |  0
 .../pykickstart/commands/driverdisk.py             |  0
 mic/{kickstart => }/pykickstart/commands/fcoe.py   |  0
 .../pykickstart/commands/firewall.py               |  0
 .../pykickstart/commands/firstboot.py              |  0
 mic/{kickstart => }/pykickstart/commands/group.py  |  0
 .../pykickstart/commands/ignoredisk.py             |  0
 .../pykickstart/commands/interactive.py            |  0
 mic/{kickstart => }/pykickstart/commands/iscsi.py  |  0
 .../pykickstart/commands/iscsiname.py              |  0
 mic/{kickstart => }/pykickstart/commands/key.py    |  0
 .../pykickstart/commands/keyboard.py               |  0
 mic/{kickstart => }/pykickstart/commands/lang.py   |  0
 .../pykickstart/commands/langsupport.py            |  0
 .../pykickstart/commands/lilocheck.py              |  0
 .../pykickstart/commands/logging.py                |  0
 mic/{kickstart => }/pykickstart/commands/logvol.py |  0
 .../pykickstart/commands/mediacheck.py             |  0
 mic/{kickstart => }/pykickstart/commands/method.py |  0
 .../pykickstart/commands/monitor.py                |  0
 mic/{kickstart => }/pykickstart/commands/mouse.py  |  0
 .../pykickstart/commands/multipath.py              |  0
 .../pykickstart/commands/network.py                |  0
 .../pykickstart/commands/partition.py              |  0
 mic/{kickstart => }/pykickstart/commands/raid.py   |  0
 mic/{kickstart => }/pykickstart/commands/reboot.py |  0
 mic/{kickstart => }/pykickstart/commands/repo.py   |  0
 mic/{kickstart => }/pykickstart/commands/rescue.py |  0
 mic/{kickstart => }/pykickstart/commands/rootpw.py |  0
 .../pykickstart/commands/selinux.py                |  0
 .../pykickstart/commands/services.py               |  0
 mic/{kickstart => }/pykickstart/commands/skipx.py  |  0
 mic/{kickstart => }/pykickstart/commands/sshpw.py  |  0
 .../pykickstart/commands/timezone.py               |  0
 .../pykickstart/commands/updates.py                |  0
 .../pykickstart/commands/upgrade.py                |  0
 mic/{kickstart => }/pykickstart/commands/user.py   |  0
 mic/{kickstart => }/pykickstart/commands/vnc.py    |  0
 .../pykickstart/commands/volgroup.py               |  0
 .../pykickstart/commands/xconfig.py                |  0
 .../pykickstart/commands/zerombr.py                |  0
 mic/{kickstart => }/pykickstart/commands/zfcp.py   |  0
 mic/{kickstart => }/pykickstart/constants.py       |  0
 mic/{kickstart => }/pykickstart/errors.py          |  0
 .../handlers}/__init__.py                          |  0
 .../pykickstart/handlers/control.py                |  0
 mic/{kickstart => }/pykickstart/handlers/f10.py    |  0
 mic/{kickstart => }/pykickstart/handlers/f11.py    |  0
 mic/{kickstart => }/pykickstart/handlers/f12.py    |  0
 mic/{kickstart => }/pykickstart/handlers/f13.py    |  0
 mic/{kickstart => }/pykickstart/handlers/f14.py    |  0
 mic/{kickstart => }/pykickstart/handlers/f15.py    |  0
 mic/{kickstart => }/pykickstart/handlers/f16.py    |  0
 mic/{kickstart => }/pykickstart/handlers/f7.py     |  0
 mic/{kickstart => }/pykickstart/handlers/f8.py     |  0
 mic/{kickstart => }/pykickstart/handlers/f9.py     |  0
 mic/{kickstart => }/pykickstart/handlers/fc3.py    |  0
 mic/{kickstart => }/pykickstart/handlers/fc4.py    |  0
 mic/{kickstart => }/pykickstart/handlers/fc5.py    |  0
 mic/{kickstart => }/pykickstart/handlers/fc6.py    |  0
 mic/{kickstart => }/pykickstart/handlers/rhel3.py  |  0
 mic/{kickstart => }/pykickstart/handlers/rhel4.py  |  0
 mic/{kickstart => }/pykickstart/handlers/rhel5.py  |  0
 mic/{kickstart => }/pykickstart/handlers/rhel6.py  |  0
 mic/{kickstart => }/pykickstart/ko.py              |  0
 mic/{kickstart => }/pykickstart/options.py         |  0
 mic/{kickstart => }/pykickstart/parser.py          |  0
 mic/{kickstart => }/pykickstart/sections.py        |  0
 mic/{kickstart => }/pykickstart/version.py         |  0
 mic/utils/errors.py                                |  2 +-
 plugins/backend/yumpkgmgr.py                       |  2 +-
 setup.py                                           |  6 ++---
 88 files changed, 29 insertions(+), 30 deletions(-)
 rename mic/{kickstart/pykickstart/handlers => pykickstart}/__init__.py (100%)
 rename mic/{kickstart => }/pykickstart/base.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/__init__.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/authconfig.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/autopart.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/autostep.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/bootloader.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/clearpart.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/device.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/deviceprobe.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/displaymode.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/dmraid.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/driverdisk.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/fcoe.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/firewall.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/firstboot.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/group.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/ignoredisk.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/interactive.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/iscsi.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/iscsiname.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/key.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/keyboard.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/lang.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/langsupport.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/lilocheck.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/logging.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/logvol.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/mediacheck.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/method.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/monitor.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/mouse.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/multipath.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/network.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/partition.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/raid.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/reboot.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/repo.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/rescue.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/rootpw.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/selinux.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/services.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/skipx.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/sshpw.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/timezone.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/updates.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/upgrade.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/user.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/vnc.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/volgroup.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/xconfig.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/zerombr.py (100%)
 rename mic/{kickstart => }/pykickstart/commands/zfcp.py (100%)
 rename mic/{kickstart => }/pykickstart/constants.py (100%)
 rename mic/{kickstart => }/pykickstart/errors.py (100%)
 rename mic/{kickstart/pykickstart => pykickstart/handlers}/__init__.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/control.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/f10.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/f11.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/f12.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/f13.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/f14.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/f15.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/f16.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/f7.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/f8.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/f9.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/fc3.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/fc4.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/fc5.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/fc6.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/rhel3.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/rhel4.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/rhel5.py (100%)
 rename mic/{kickstart => }/pykickstart/handlers/rhel6.py (100%)
 rename mic/{kickstart => }/pykickstart/ko.py (100%)
 rename mic/{kickstart => }/pykickstart/options.py (100%)
 rename mic/{kickstart => }/pykickstart/parser.py (100%)
 rename mic/{kickstart => }/pykickstart/sections.py (100%)
 rename mic/{kickstart => }/pykickstart/version.py (100%)

diff --git a/mic/__init__.py b/mic/__init__.py
index e69de29..92649b9 100644
--- a/mic/__init__.py
+++ b/mic/__init__.py
@@ -0,0 +1,3 @@
+import os, sys
+
+sys.path.insert(0, os.path.dirname(__file__) or '.')
diff --git a/mic/configmgr.py b/mic/configmgr.py
index 717a755..1ba75e2 100644
--- a/mic/configmgr.py
+++ b/mic/configmgr.py
@@ -22,6 +22,7 @@ import logging
 import ConfigParser
 import mic.utils as utils
 import mic.utils.errors as errors
+from mic import kickstart
 from mic import msger
 
 DEFAULT_GSITECONF='/etc/mic/mic.conf'
@@ -75,7 +76,6 @@ class ConfigMgr(object):
     def __set_ksconf(self, ksconf):
         self.ksconf = ksconf
         self.parse_kickstart(ksconf)
-        pass
     def __get_ksconf(self):
         return self.ksconf
     _ksconf = property(__get_ksconf, __set_ksconf)
@@ -111,17 +111,17 @@ class ConfigMgr(object):
             return
 
         try:
-            kickstart = utils.kickstart.read_kickstart(ksconf)
-            ksrepos = utils.misc.get_repostrs_from_ks(kickstart)
+            ks = kickstart.read_kickstart(ksconf)
+            ksrepos = utils.misc.get_repostrs_from_ks(ks)
             msger.info("Retrieving repo metadata:")
             repometadata = utils.misc.get_metadata_from_repos(ksrepos, self.create['cachedir'])
-            msger.info("\nDONE")
+            msger.raw(" DONE")
 
-            self.create['ks'] = kickstart
+            self.create['ks'] = ks
             self.create['repomd'] = repometadata
             self.create['name'] = os.path.splitext(os.path.basename(ksconf))[0]
         except Exception, e:
-            raise errors.KickstartError("Unable to load kickstart file '%s': %s" % (ksconf, e))
+            raise errors.KsError("Unable to load kickstart file '%s': %s" % (ksconf, e))
 
     def setProperty(self, key, value):
         if not hasattr(self, key):
diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py
index 4089d10..a4fab4a 100644
--- a/mic/imager/baseimager.py
+++ b/mic/imager/baseimager.py
@@ -139,8 +139,8 @@ class BaseImageCreator(object):
                 vdso_value = vdso_fh.read().strip()
                 vdso_fh.close()
                 if (int)(vdso_value) == 1:
-                    msger.warning("vdso is enabled on your host, which might cause problems with arm emulations.\n" +
-                                  "\tYou can disable vdso with following command before starting image build:\n" +
+                    msger.warning("vdso is enabled on your host, which might cause problems with arm emulations.\n"
+                                  "\tYou can disable vdso with following command before starting image build:\n"
                                   "\techo 0 | sudo tee /proc/sys/vm/vdso_enabled")
 
         return True
diff --git a/mic/imager/loop.py b/mic/imager/loop.py
index bd584fa..c3e111d 100644
--- a/mic/imager/loop.py
+++ b/mic/imager/loop.py
@@ -17,13 +17,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import os
-import os.path
 import subprocess
-import mic.kickstart as kickstart
 from baseimager import BaseImageCreator
 from mic.utils.errors import *
 from mic.utils.fs_related import *
 from mic.utils.misc import *
+from mic import kickstart
 
 FSLABEL_MAXLEN = 32
 """The maximum string length supported for LoopImageCreator.fslabel."""
diff --git a/mic/kickstart/__init__.py b/mic/kickstart/__init__.py
index 8e28003..9055f80 100644
--- a/mic/kickstart/__init__.py
+++ b/mic/kickstart/__init__.py
@@ -28,9 +28,6 @@ from mic.utils import misc
 from mic.utils import fs_related as fs
 from mic import msger
 
-sys.path.insert(0, os.path.dirname(__file__) or '.')
-import pykickstart
-
 import pykickstart.commands as kscommands
 import pykickstart.constants as ksconstants
 import pykickstart.errors as kserrors
@@ -72,11 +69,11 @@ def read_kickstart(path):
     try:
         ks.readKickstart(path)
     except IOError, (err, msg):
-        raise errors.KickstartError("Failed to read kickstart file "
-                                    "'%s' : %s" % (path, msg))
-    except kserrors.KickstartError, e:
-        raise errors.KickstartError("Failed to parse kickstart file "
-                                    "'%s' : %s" % (path, e))
+        raise errors.KsError("Failed to read kickstart file "
+                             "'%s' : %s" % (path, msg))
+    except kserrors.KickstartParseError, e:
+        raise errors.KsError("Failed to parse kickstart file "
+                             "'%s' : %s" % (path, e))
     return ks
 
 def build_name(kscfg, prefix = None, suffix = None, maxlen = None):
@@ -136,7 +133,7 @@ class KickstartConfig(object):
     def call(self, args):
         if not os.path.exists("%s/%s" %(self.instroot, args[0])):
             msger.warning("%s/%s" %(self.instroot, args[0]))
-            raise errors.KickstartError("Unable to run %s!" %(args))
+            raise errors.KsError("Unable to run %s!" %(args))
         subprocess.call(args, preexec_fn = self.chroot)
 
     def apply(self):
@@ -179,7 +176,7 @@ class TimezoneConfig(KickstartConfig):
             shutil.copyfile(self.path("/usr/share/zoneinfo/%s" %(tz,)),
                             self.path("/etc/localtime"))
         except (IOError, OSError), (errno, msg):
-            raise errors.KickstartError("Error copying timezone info: %s" %(msg,))
+            raise errors.KsError("Error copying timezone info: %s" %(msg,))
 
 
 class AuthConfig(KickstartConfig):
@@ -216,7 +213,7 @@ class RootPasswordConfig(KickstartConfig):
     def set_unencrypted(self, password):
         for p in ("/bin/echo", "/usr/sbin/chpasswd"):
             if not os.path.exists("%s/%s" %(self.instroot, p)):
-                raise errors.KickstartError("Unable to set unencrypted password due to lack of %s" % p)
+                raise errors.KsError("Unable to set unencrypted password due to lack of %s" % p)
 
         p1 = subprocess.Popen(["/bin/echo", "root:%s" %password],
                               stdout = subprocess.PIPE,
@@ -245,7 +242,7 @@ class UserConfig(KickstartConfig):
     def set_unencrypted_passwd(self, user, password):
         for p in ("/bin/echo", "/usr/sbin/chpasswd"):
             if not os.path.exists("%s/%s" %(self.instroot, p)):
-                raise errors.KickstartError("Unable to set unencrypted password due to lack of %s" % p)
+                raise errors.KsError("Unable to set unencrypted password due to lack of %s" % p)
 
         p1 = subprocess.Popen(["/bin/echo", "%s:%s" %(user, password)],
                               stdout = subprocess.PIPE,
@@ -276,7 +273,7 @@ class UserConfig(KickstartConfig):
             else:
                 self.set_empty_passwd(userconfig.name)
         else:
-            raise errors.KickstartError("Invalid kickstart command: %s" % userconfig.__str__())
+            raise errors.KsError("Invalid kickstart command: %s" % userconfig.__str__())
 
     def apply(self, user):
         for userconfig in user.userList:
@@ -559,12 +556,12 @@ class NetworkConfig(KickstartConfig):
 
         for network in ksnet.network:
             if not network.device:
-                raise errors.KickstartError("No --device specified with "
+                raise errors.KsError("No --device specified with "
                                             "network kickstart command")
 
             if (network.onboot and network.bootProto.lower() != "dhcp" and
                 not (network.ip and network.netmask)):
-                raise errors.KickstartError("No IP address and/or netmask "
+                raise errors.KsError("No IP address and/or netmask "
                                             "specified with static "
                                             "configuration for '%s'" %
                                             network.device)
diff --git a/mic/kickstart/pykickstart/handlers/__init__.py b/mic/pykickstart/__init__.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/__init__.py
rename to mic/pykickstart/__init__.py
diff --git a/mic/kickstart/pykickstart/base.py b/mic/pykickstart/base.py
similarity index 100%
rename from mic/kickstart/pykickstart/base.py
rename to mic/pykickstart/base.py
diff --git a/mic/kickstart/pykickstart/commands/__init__.py b/mic/pykickstart/commands/__init__.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/__init__.py
rename to mic/pykickstart/commands/__init__.py
diff --git a/mic/kickstart/pykickstart/commands/authconfig.py b/mic/pykickstart/commands/authconfig.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/authconfig.py
rename to mic/pykickstart/commands/authconfig.py
diff --git a/mic/kickstart/pykickstart/commands/autopart.py b/mic/pykickstart/commands/autopart.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/autopart.py
rename to mic/pykickstart/commands/autopart.py
diff --git a/mic/kickstart/pykickstart/commands/autostep.py b/mic/pykickstart/commands/autostep.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/autostep.py
rename to mic/pykickstart/commands/autostep.py
diff --git a/mic/kickstart/pykickstart/commands/bootloader.py b/mic/pykickstart/commands/bootloader.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/bootloader.py
rename to mic/pykickstart/commands/bootloader.py
diff --git a/mic/kickstart/pykickstart/commands/clearpart.py b/mic/pykickstart/commands/clearpart.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/clearpart.py
rename to mic/pykickstart/commands/clearpart.py
diff --git a/mic/kickstart/pykickstart/commands/device.py b/mic/pykickstart/commands/device.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/device.py
rename to mic/pykickstart/commands/device.py
diff --git a/mic/kickstart/pykickstart/commands/deviceprobe.py b/mic/pykickstart/commands/deviceprobe.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/deviceprobe.py
rename to mic/pykickstart/commands/deviceprobe.py
diff --git a/mic/kickstart/pykickstart/commands/displaymode.py b/mic/pykickstart/commands/displaymode.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/displaymode.py
rename to mic/pykickstart/commands/displaymode.py
diff --git a/mic/kickstart/pykickstart/commands/dmraid.py b/mic/pykickstart/commands/dmraid.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/dmraid.py
rename to mic/pykickstart/commands/dmraid.py
diff --git a/mic/kickstart/pykickstart/commands/driverdisk.py b/mic/pykickstart/commands/driverdisk.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/driverdisk.py
rename to mic/pykickstart/commands/driverdisk.py
diff --git a/mic/kickstart/pykickstart/commands/fcoe.py b/mic/pykickstart/commands/fcoe.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/fcoe.py
rename to mic/pykickstart/commands/fcoe.py
diff --git a/mic/kickstart/pykickstart/commands/firewall.py b/mic/pykickstart/commands/firewall.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/firewall.py
rename to mic/pykickstart/commands/firewall.py
diff --git a/mic/kickstart/pykickstart/commands/firstboot.py b/mic/pykickstart/commands/firstboot.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/firstboot.py
rename to mic/pykickstart/commands/firstboot.py
diff --git a/mic/kickstart/pykickstart/commands/group.py b/mic/pykickstart/commands/group.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/group.py
rename to mic/pykickstart/commands/group.py
diff --git a/mic/kickstart/pykickstart/commands/ignoredisk.py b/mic/pykickstart/commands/ignoredisk.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/ignoredisk.py
rename to mic/pykickstart/commands/ignoredisk.py
diff --git a/mic/kickstart/pykickstart/commands/interactive.py b/mic/pykickstart/commands/interactive.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/interactive.py
rename to mic/pykickstart/commands/interactive.py
diff --git a/mic/kickstart/pykickstart/commands/iscsi.py b/mic/pykickstart/commands/iscsi.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/iscsi.py
rename to mic/pykickstart/commands/iscsi.py
diff --git a/mic/kickstart/pykickstart/commands/iscsiname.py b/mic/pykickstart/commands/iscsiname.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/iscsiname.py
rename to mic/pykickstart/commands/iscsiname.py
diff --git a/mic/kickstart/pykickstart/commands/key.py b/mic/pykickstart/commands/key.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/key.py
rename to mic/pykickstart/commands/key.py
diff --git a/mic/kickstart/pykickstart/commands/keyboard.py b/mic/pykickstart/commands/keyboard.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/keyboard.py
rename to mic/pykickstart/commands/keyboard.py
diff --git a/mic/kickstart/pykickstart/commands/lang.py b/mic/pykickstart/commands/lang.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/lang.py
rename to mic/pykickstart/commands/lang.py
diff --git a/mic/kickstart/pykickstart/commands/langsupport.py b/mic/pykickstart/commands/langsupport.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/langsupport.py
rename to mic/pykickstart/commands/langsupport.py
diff --git a/mic/kickstart/pykickstart/commands/lilocheck.py b/mic/pykickstart/commands/lilocheck.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/lilocheck.py
rename to mic/pykickstart/commands/lilocheck.py
diff --git a/mic/kickstart/pykickstart/commands/logging.py b/mic/pykickstart/commands/logging.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/logging.py
rename to mic/pykickstart/commands/logging.py
diff --git a/mic/kickstart/pykickstart/commands/logvol.py b/mic/pykickstart/commands/logvol.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/logvol.py
rename to mic/pykickstart/commands/logvol.py
diff --git a/mic/kickstart/pykickstart/commands/mediacheck.py b/mic/pykickstart/commands/mediacheck.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/mediacheck.py
rename to mic/pykickstart/commands/mediacheck.py
diff --git a/mic/kickstart/pykickstart/commands/method.py b/mic/pykickstart/commands/method.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/method.py
rename to mic/pykickstart/commands/method.py
diff --git a/mic/kickstart/pykickstart/commands/monitor.py b/mic/pykickstart/commands/monitor.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/monitor.py
rename to mic/pykickstart/commands/monitor.py
diff --git a/mic/kickstart/pykickstart/commands/mouse.py b/mic/pykickstart/commands/mouse.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/mouse.py
rename to mic/pykickstart/commands/mouse.py
diff --git a/mic/kickstart/pykickstart/commands/multipath.py b/mic/pykickstart/commands/multipath.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/multipath.py
rename to mic/pykickstart/commands/multipath.py
diff --git a/mic/kickstart/pykickstart/commands/network.py b/mic/pykickstart/commands/network.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/network.py
rename to mic/pykickstart/commands/network.py
diff --git a/mic/kickstart/pykickstart/commands/partition.py b/mic/pykickstart/commands/partition.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/partition.py
rename to mic/pykickstart/commands/partition.py
diff --git a/mic/kickstart/pykickstart/commands/raid.py b/mic/pykickstart/commands/raid.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/raid.py
rename to mic/pykickstart/commands/raid.py
diff --git a/mic/kickstart/pykickstart/commands/reboot.py b/mic/pykickstart/commands/reboot.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/reboot.py
rename to mic/pykickstart/commands/reboot.py
diff --git a/mic/kickstart/pykickstart/commands/repo.py b/mic/pykickstart/commands/repo.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/repo.py
rename to mic/pykickstart/commands/repo.py
diff --git a/mic/kickstart/pykickstart/commands/rescue.py b/mic/pykickstart/commands/rescue.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/rescue.py
rename to mic/pykickstart/commands/rescue.py
diff --git a/mic/kickstart/pykickstart/commands/rootpw.py b/mic/pykickstart/commands/rootpw.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/rootpw.py
rename to mic/pykickstart/commands/rootpw.py
diff --git a/mic/kickstart/pykickstart/commands/selinux.py b/mic/pykickstart/commands/selinux.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/selinux.py
rename to mic/pykickstart/commands/selinux.py
diff --git a/mic/kickstart/pykickstart/commands/services.py b/mic/pykickstart/commands/services.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/services.py
rename to mic/pykickstart/commands/services.py
diff --git a/mic/kickstart/pykickstart/commands/skipx.py b/mic/pykickstart/commands/skipx.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/skipx.py
rename to mic/pykickstart/commands/skipx.py
diff --git a/mic/kickstart/pykickstart/commands/sshpw.py b/mic/pykickstart/commands/sshpw.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/sshpw.py
rename to mic/pykickstart/commands/sshpw.py
diff --git a/mic/kickstart/pykickstart/commands/timezone.py b/mic/pykickstart/commands/timezone.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/timezone.py
rename to mic/pykickstart/commands/timezone.py
diff --git a/mic/kickstart/pykickstart/commands/updates.py b/mic/pykickstart/commands/updates.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/updates.py
rename to mic/pykickstart/commands/updates.py
diff --git a/mic/kickstart/pykickstart/commands/upgrade.py b/mic/pykickstart/commands/upgrade.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/upgrade.py
rename to mic/pykickstart/commands/upgrade.py
diff --git a/mic/kickstart/pykickstart/commands/user.py b/mic/pykickstart/commands/user.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/user.py
rename to mic/pykickstart/commands/user.py
diff --git a/mic/kickstart/pykickstart/commands/vnc.py b/mic/pykickstart/commands/vnc.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/vnc.py
rename to mic/pykickstart/commands/vnc.py
diff --git a/mic/kickstart/pykickstart/commands/volgroup.py b/mic/pykickstart/commands/volgroup.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/volgroup.py
rename to mic/pykickstart/commands/volgroup.py
diff --git a/mic/kickstart/pykickstart/commands/xconfig.py b/mic/pykickstart/commands/xconfig.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/xconfig.py
rename to mic/pykickstart/commands/xconfig.py
diff --git a/mic/kickstart/pykickstart/commands/zerombr.py b/mic/pykickstart/commands/zerombr.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/zerombr.py
rename to mic/pykickstart/commands/zerombr.py
diff --git a/mic/kickstart/pykickstart/commands/zfcp.py b/mic/pykickstart/commands/zfcp.py
similarity index 100%
rename from mic/kickstart/pykickstart/commands/zfcp.py
rename to mic/pykickstart/commands/zfcp.py
diff --git a/mic/kickstart/pykickstart/constants.py b/mic/pykickstart/constants.py
similarity index 100%
rename from mic/kickstart/pykickstart/constants.py
rename to mic/pykickstart/constants.py
diff --git a/mic/kickstart/pykickstart/errors.py b/mic/pykickstart/errors.py
similarity index 100%
rename from mic/kickstart/pykickstart/errors.py
rename to mic/pykickstart/errors.py
diff --git a/mic/kickstart/pykickstart/__init__.py b/mic/pykickstart/handlers/__init__.py
similarity index 100%
rename from mic/kickstart/pykickstart/__init__.py
rename to mic/pykickstart/handlers/__init__.py
diff --git a/mic/kickstart/pykickstart/handlers/control.py b/mic/pykickstart/handlers/control.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/control.py
rename to mic/pykickstart/handlers/control.py
diff --git a/mic/kickstart/pykickstart/handlers/f10.py b/mic/pykickstart/handlers/f10.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/f10.py
rename to mic/pykickstart/handlers/f10.py
diff --git a/mic/kickstart/pykickstart/handlers/f11.py b/mic/pykickstart/handlers/f11.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/f11.py
rename to mic/pykickstart/handlers/f11.py
diff --git a/mic/kickstart/pykickstart/handlers/f12.py b/mic/pykickstart/handlers/f12.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/f12.py
rename to mic/pykickstart/handlers/f12.py
diff --git a/mic/kickstart/pykickstart/handlers/f13.py b/mic/pykickstart/handlers/f13.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/f13.py
rename to mic/pykickstart/handlers/f13.py
diff --git a/mic/kickstart/pykickstart/handlers/f14.py b/mic/pykickstart/handlers/f14.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/f14.py
rename to mic/pykickstart/handlers/f14.py
diff --git a/mic/kickstart/pykickstart/handlers/f15.py b/mic/pykickstart/handlers/f15.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/f15.py
rename to mic/pykickstart/handlers/f15.py
diff --git a/mic/kickstart/pykickstart/handlers/f16.py b/mic/pykickstart/handlers/f16.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/f16.py
rename to mic/pykickstart/handlers/f16.py
diff --git a/mic/kickstart/pykickstart/handlers/f7.py b/mic/pykickstart/handlers/f7.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/f7.py
rename to mic/pykickstart/handlers/f7.py
diff --git a/mic/kickstart/pykickstart/handlers/f8.py b/mic/pykickstart/handlers/f8.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/f8.py
rename to mic/pykickstart/handlers/f8.py
diff --git a/mic/kickstart/pykickstart/handlers/f9.py b/mic/pykickstart/handlers/f9.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/f9.py
rename to mic/pykickstart/handlers/f9.py
diff --git a/mic/kickstart/pykickstart/handlers/fc3.py b/mic/pykickstart/handlers/fc3.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/fc3.py
rename to mic/pykickstart/handlers/fc3.py
diff --git a/mic/kickstart/pykickstart/handlers/fc4.py b/mic/pykickstart/handlers/fc4.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/fc4.py
rename to mic/pykickstart/handlers/fc4.py
diff --git a/mic/kickstart/pykickstart/handlers/fc5.py b/mic/pykickstart/handlers/fc5.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/fc5.py
rename to mic/pykickstart/handlers/fc5.py
diff --git a/mic/kickstart/pykickstart/handlers/fc6.py b/mic/pykickstart/handlers/fc6.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/fc6.py
rename to mic/pykickstart/handlers/fc6.py
diff --git a/mic/kickstart/pykickstart/handlers/rhel3.py b/mic/pykickstart/handlers/rhel3.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/rhel3.py
rename to mic/pykickstart/handlers/rhel3.py
diff --git a/mic/kickstart/pykickstart/handlers/rhel4.py b/mic/pykickstart/handlers/rhel4.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/rhel4.py
rename to mic/pykickstart/handlers/rhel4.py
diff --git a/mic/kickstart/pykickstart/handlers/rhel5.py b/mic/pykickstart/handlers/rhel5.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/rhel5.py
rename to mic/pykickstart/handlers/rhel5.py
diff --git a/mic/kickstart/pykickstart/handlers/rhel6.py b/mic/pykickstart/handlers/rhel6.py
similarity index 100%
rename from mic/kickstart/pykickstart/handlers/rhel6.py
rename to mic/pykickstart/handlers/rhel6.py
diff --git a/mic/kickstart/pykickstart/ko.py b/mic/pykickstart/ko.py
similarity index 100%
rename from mic/kickstart/pykickstart/ko.py
rename to mic/pykickstart/ko.py
diff --git a/mic/kickstart/pykickstart/options.py b/mic/pykickstart/options.py
similarity index 100%
rename from mic/kickstart/pykickstart/options.py
rename to mic/pykickstart/options.py
diff --git a/mic/kickstart/pykickstart/parser.py b/mic/pykickstart/parser.py
similarity index 100%
rename from mic/kickstart/pykickstart/parser.py
rename to mic/pykickstart/parser.py
diff --git a/mic/kickstart/pykickstart/sections.py b/mic/pykickstart/sections.py
similarity index 100%
rename from mic/kickstart/pykickstart/sections.py
rename to mic/pykickstart/sections.py
diff --git a/mic/kickstart/pykickstart/version.py b/mic/pykickstart/version.py
similarity index 100%
rename from mic/kickstart/pykickstart/version.py
rename to mic/pykickstart/version.py
diff --git a/mic/utils/errors.py b/mic/utils/errors.py
index 7d7c69d..3b0c861 100644
--- a/mic/utils/errors.py
+++ b/mic/utils/errors.py
@@ -29,7 +29,7 @@ class CreatorError(Exception):
     def __init__(self, msg):
         Exception.__init__(self, msg)
 
-class KickstartError(CreatorError):
+class KsError(CreatorError):
     pass
 class MountError(CreatorError):
     pass
diff --git a/plugins/backend/yumpkgmgr.py b/plugins/backend/yumpkgmgr.py
index 9f3ddfb..916781b 100644
--- a/plugins/backend/yumpkgmgr.py
+++ b/plugins/backend/yumpkgmgr.py
@@ -23,7 +23,7 @@ import logging
 
 import yum
 import rpmUtils
-from mic.kickstart.pykickstart import parser as ksparser
+from pykickstart import parser as ksparser
 
 import urlparse
 import urllib2 as u2
diff --git a/setup.py b/setup.py
index 1d3a17a..fe045c7 100644
--- a/setup.py
+++ b/setup.py
@@ -36,9 +36,9 @@ PACKAGES = [MOD_NAME,
             MOD_NAME + '/pluginbase',
             MOD_NAME + '/kickstart',
             MOD_NAME + '/kickstart/custom_commands',
-            MOD_NAME + '/kickstart/pykickstart',
-            MOD_NAME + '/kickstart/pykickstart/commands',
-            MOD_NAME + '/kickstart/pykickstart/handlers',
+            MOD_NAME + '/pykickstart',
+            MOD_NAME + '/pykickstart/commands',
+            MOD_NAME + '/pykickstart/handlers',
            ]
 
 setup(name=MOD_NAME,
-- 
2.7.4