From 4a9e240b3ed40525cc66f340a8d7d4c1c7fd1215 Mon Sep 17 00:00:00 2001 From: JF Ding Date: Fri, 19 Aug 2011 09:55:20 +0800 Subject: [PATCH] reorg the dir structure of kickstart modules The integrated pykickstart modules is from latest git. --- mic/kickstart/custom_commands/__init__.py | 12 +++++++++++ .../custom_commands}/desktop.py | 0 .../custom_commands}/micboot.py | 0 .../custom_commands}/moblinrepo.py | 0 mic/{utils => kickstart}/kickstart.py | 23 +++++++++------------- .../handlers => kickstart/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 .../pykickstart/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/kscommands/__init__.py | 17 ---------------- setup.py | 7 ++++++- 87 files changed, 27 insertions(+), 32 deletions(-) create mode 100644 mic/kickstart/custom_commands/__init__.py rename mic/{utils/kscommands => kickstart/custom_commands}/desktop.py (100%) rename mic/{utils/kscommands => kickstart/custom_commands}/micboot.py (100%) rename mic/{utils/kscommands => kickstart/custom_commands}/moblinrepo.py (100%) rename mic/{utils => kickstart}/kickstart.py (98%) rename mic/{pykickstart/handlers => kickstart/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/{pykickstart => kickstart/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%) delete mode 100644 mic/utils/kscommands/__init__.py diff --git a/mic/kickstart/custom_commands/__init__.py b/mic/kickstart/custom_commands/__init__.py new file mode 100644 index 0000000..7d741f6 --- /dev/null +++ b/mic/kickstart/custom_commands/__init__.py @@ -0,0 +1,12 @@ +import sys +sys.path.append(os.path.dirname(__file__) or '.') +import pykickstart + +import desktop +import moblinrepo + +__all__ = ( + "Moblin_Desktop", + "Moblin_Repo", + "Moblin_RepoData", +) diff --git a/mic/utils/kscommands/desktop.py b/mic/kickstart/custom_commands/desktop.py similarity index 100% rename from mic/utils/kscommands/desktop.py rename to mic/kickstart/custom_commands/desktop.py diff --git a/mic/utils/kscommands/micboot.py b/mic/kickstart/custom_commands/micboot.py similarity index 100% rename from mic/utils/kscommands/micboot.py rename to mic/kickstart/custom_commands/micboot.py diff --git a/mic/utils/kscommands/moblinrepo.py b/mic/kickstart/custom_commands/moblinrepo.py similarity index 100% rename from mic/utils/kscommands/moblinrepo.py rename to mic/kickstart/custom_commands/moblinrepo.py diff --git a/mic/utils/kickstart.py b/mic/kickstart/kickstart.py similarity index 98% rename from mic/utils/kickstart.py rename to mic/kickstart/kickstart.py index f7efe95..b1b599c 100644 --- a/mic/utils/kickstart.py +++ b/mic/kickstart/kickstart.py @@ -17,20 +17,18 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. import os, sys -import os.path import shutil import subprocess import time import logging import string -try: - import pykickstart -except: - import mic - sys.path.insert(0, mic.__path__[0]) - import pykickstart - del(sys.path[0]) +import errors +import misc +import fs_related as fs + +sys.path.append(os.path.dirname(__file__) or '.') +import pykickstart import pykickstart.commands as kscommands import pykickstart.constants as ksconstants @@ -40,12 +38,9 @@ import pykickstart.version as ksversion from pykickstart.handlers.control import commandMap from pykickstart.handlers.control import dataMap -import errors as errors -import fs_related as fs -import misc as misc -import kscommands.desktop as desktop -import kscommands.moblinrepo as moblinrepo -import kscommands.micboot as micboot +import custom_commands.desktop as desktop +import custom_commands.moblinrepo as moblinrepo +import custom_commands.micboot as micboot def read_kickstart(path): """Parse a kickstart file and return a KickstartParser instance. diff --git a/mic/pykickstart/handlers/__init__.py b/mic/kickstart/pykickstart/__init__.py similarity index 100% rename from mic/pykickstart/handlers/__init__.py rename to mic/kickstart/pykickstart/__init__.py diff --git a/mic/pykickstart/base.py b/mic/kickstart/pykickstart/base.py similarity index 100% rename from mic/pykickstart/base.py rename to mic/kickstart/pykickstart/base.py diff --git a/mic/pykickstart/commands/__init__.py b/mic/kickstart/pykickstart/commands/__init__.py similarity index 100% rename from mic/pykickstart/commands/__init__.py rename to mic/kickstart/pykickstart/commands/__init__.py diff --git a/mic/pykickstart/commands/authconfig.py b/mic/kickstart/pykickstart/commands/authconfig.py similarity index 100% rename from mic/pykickstart/commands/authconfig.py rename to mic/kickstart/pykickstart/commands/authconfig.py diff --git a/mic/pykickstart/commands/autopart.py b/mic/kickstart/pykickstart/commands/autopart.py similarity index 100% rename from mic/pykickstart/commands/autopart.py rename to mic/kickstart/pykickstart/commands/autopart.py diff --git a/mic/pykickstart/commands/autostep.py b/mic/kickstart/pykickstart/commands/autostep.py similarity index 100% rename from mic/pykickstart/commands/autostep.py rename to mic/kickstart/pykickstart/commands/autostep.py diff --git a/mic/pykickstart/commands/bootloader.py b/mic/kickstart/pykickstart/commands/bootloader.py similarity index 100% rename from mic/pykickstart/commands/bootloader.py rename to mic/kickstart/pykickstart/commands/bootloader.py diff --git a/mic/pykickstart/commands/clearpart.py b/mic/kickstart/pykickstart/commands/clearpart.py similarity index 100% rename from mic/pykickstart/commands/clearpart.py rename to mic/kickstart/pykickstart/commands/clearpart.py diff --git a/mic/pykickstart/commands/device.py b/mic/kickstart/pykickstart/commands/device.py similarity index 100% rename from mic/pykickstart/commands/device.py rename to mic/kickstart/pykickstart/commands/device.py diff --git a/mic/pykickstart/commands/deviceprobe.py b/mic/kickstart/pykickstart/commands/deviceprobe.py similarity index 100% rename from mic/pykickstart/commands/deviceprobe.py rename to mic/kickstart/pykickstart/commands/deviceprobe.py diff --git a/mic/pykickstart/commands/displaymode.py b/mic/kickstart/pykickstart/commands/displaymode.py similarity index 100% rename from mic/pykickstart/commands/displaymode.py rename to mic/kickstart/pykickstart/commands/displaymode.py diff --git a/mic/pykickstart/commands/dmraid.py b/mic/kickstart/pykickstart/commands/dmraid.py similarity index 100% rename from mic/pykickstart/commands/dmraid.py rename to mic/kickstart/pykickstart/commands/dmraid.py diff --git a/mic/pykickstart/commands/driverdisk.py b/mic/kickstart/pykickstart/commands/driverdisk.py similarity index 100% rename from mic/pykickstart/commands/driverdisk.py rename to mic/kickstart/pykickstart/commands/driverdisk.py diff --git a/mic/pykickstart/commands/fcoe.py b/mic/kickstart/pykickstart/commands/fcoe.py similarity index 100% rename from mic/pykickstart/commands/fcoe.py rename to mic/kickstart/pykickstart/commands/fcoe.py diff --git a/mic/pykickstart/commands/firewall.py b/mic/kickstart/pykickstart/commands/firewall.py similarity index 100% rename from mic/pykickstart/commands/firewall.py rename to mic/kickstart/pykickstart/commands/firewall.py diff --git a/mic/pykickstart/commands/firstboot.py b/mic/kickstart/pykickstart/commands/firstboot.py similarity index 100% rename from mic/pykickstart/commands/firstboot.py rename to mic/kickstart/pykickstart/commands/firstboot.py diff --git a/mic/pykickstart/commands/group.py b/mic/kickstart/pykickstart/commands/group.py similarity index 100% rename from mic/pykickstart/commands/group.py rename to mic/kickstart/pykickstart/commands/group.py diff --git a/mic/pykickstart/commands/ignoredisk.py b/mic/kickstart/pykickstart/commands/ignoredisk.py similarity index 100% rename from mic/pykickstart/commands/ignoredisk.py rename to mic/kickstart/pykickstart/commands/ignoredisk.py diff --git a/mic/pykickstart/commands/interactive.py b/mic/kickstart/pykickstart/commands/interactive.py similarity index 100% rename from mic/pykickstart/commands/interactive.py rename to mic/kickstart/pykickstart/commands/interactive.py diff --git a/mic/pykickstart/commands/iscsi.py b/mic/kickstart/pykickstart/commands/iscsi.py similarity index 100% rename from mic/pykickstart/commands/iscsi.py rename to mic/kickstart/pykickstart/commands/iscsi.py diff --git a/mic/pykickstart/commands/iscsiname.py b/mic/kickstart/pykickstart/commands/iscsiname.py similarity index 100% rename from mic/pykickstart/commands/iscsiname.py rename to mic/kickstart/pykickstart/commands/iscsiname.py diff --git a/mic/pykickstart/commands/key.py b/mic/kickstart/pykickstart/commands/key.py similarity index 100% rename from mic/pykickstart/commands/key.py rename to mic/kickstart/pykickstart/commands/key.py diff --git a/mic/pykickstart/commands/keyboard.py b/mic/kickstart/pykickstart/commands/keyboard.py similarity index 100% rename from mic/pykickstart/commands/keyboard.py rename to mic/kickstart/pykickstart/commands/keyboard.py diff --git a/mic/pykickstart/commands/lang.py b/mic/kickstart/pykickstart/commands/lang.py similarity index 100% rename from mic/pykickstart/commands/lang.py rename to mic/kickstart/pykickstart/commands/lang.py diff --git a/mic/pykickstart/commands/langsupport.py b/mic/kickstart/pykickstart/commands/langsupport.py similarity index 100% rename from mic/pykickstart/commands/langsupport.py rename to mic/kickstart/pykickstart/commands/langsupport.py diff --git a/mic/pykickstart/commands/lilocheck.py b/mic/kickstart/pykickstart/commands/lilocheck.py similarity index 100% rename from mic/pykickstart/commands/lilocheck.py rename to mic/kickstart/pykickstart/commands/lilocheck.py diff --git a/mic/pykickstart/commands/logging.py b/mic/kickstart/pykickstart/commands/logging.py similarity index 100% rename from mic/pykickstart/commands/logging.py rename to mic/kickstart/pykickstart/commands/logging.py diff --git a/mic/pykickstart/commands/logvol.py b/mic/kickstart/pykickstart/commands/logvol.py similarity index 100% rename from mic/pykickstart/commands/logvol.py rename to mic/kickstart/pykickstart/commands/logvol.py diff --git a/mic/pykickstart/commands/mediacheck.py b/mic/kickstart/pykickstart/commands/mediacheck.py similarity index 100% rename from mic/pykickstart/commands/mediacheck.py rename to mic/kickstart/pykickstart/commands/mediacheck.py diff --git a/mic/pykickstart/commands/method.py b/mic/kickstart/pykickstart/commands/method.py similarity index 100% rename from mic/pykickstart/commands/method.py rename to mic/kickstart/pykickstart/commands/method.py diff --git a/mic/pykickstart/commands/monitor.py b/mic/kickstart/pykickstart/commands/monitor.py similarity index 100% rename from mic/pykickstart/commands/monitor.py rename to mic/kickstart/pykickstart/commands/monitor.py diff --git a/mic/pykickstart/commands/mouse.py b/mic/kickstart/pykickstart/commands/mouse.py similarity index 100% rename from mic/pykickstart/commands/mouse.py rename to mic/kickstart/pykickstart/commands/mouse.py diff --git a/mic/pykickstart/commands/multipath.py b/mic/kickstart/pykickstart/commands/multipath.py similarity index 100% rename from mic/pykickstart/commands/multipath.py rename to mic/kickstart/pykickstart/commands/multipath.py diff --git a/mic/pykickstart/commands/network.py b/mic/kickstart/pykickstart/commands/network.py similarity index 100% rename from mic/pykickstart/commands/network.py rename to mic/kickstart/pykickstart/commands/network.py diff --git a/mic/pykickstart/commands/partition.py b/mic/kickstart/pykickstart/commands/partition.py similarity index 100% rename from mic/pykickstart/commands/partition.py rename to mic/kickstart/pykickstart/commands/partition.py diff --git a/mic/pykickstart/commands/raid.py b/mic/kickstart/pykickstart/commands/raid.py similarity index 100% rename from mic/pykickstart/commands/raid.py rename to mic/kickstart/pykickstart/commands/raid.py diff --git a/mic/pykickstart/commands/reboot.py b/mic/kickstart/pykickstart/commands/reboot.py similarity index 100% rename from mic/pykickstart/commands/reboot.py rename to mic/kickstart/pykickstart/commands/reboot.py diff --git a/mic/pykickstart/commands/repo.py b/mic/kickstart/pykickstart/commands/repo.py similarity index 100% rename from mic/pykickstart/commands/repo.py rename to mic/kickstart/pykickstart/commands/repo.py diff --git a/mic/pykickstart/commands/rescue.py b/mic/kickstart/pykickstart/commands/rescue.py similarity index 100% rename from mic/pykickstart/commands/rescue.py rename to mic/kickstart/pykickstart/commands/rescue.py diff --git a/mic/pykickstart/commands/rootpw.py b/mic/kickstart/pykickstart/commands/rootpw.py similarity index 100% rename from mic/pykickstart/commands/rootpw.py rename to mic/kickstart/pykickstart/commands/rootpw.py diff --git a/mic/pykickstart/commands/selinux.py b/mic/kickstart/pykickstart/commands/selinux.py similarity index 100% rename from mic/pykickstart/commands/selinux.py rename to mic/kickstart/pykickstart/commands/selinux.py diff --git a/mic/pykickstart/commands/services.py b/mic/kickstart/pykickstart/commands/services.py similarity index 100% rename from mic/pykickstart/commands/services.py rename to mic/kickstart/pykickstart/commands/services.py diff --git a/mic/pykickstart/commands/skipx.py b/mic/kickstart/pykickstart/commands/skipx.py similarity index 100% rename from mic/pykickstart/commands/skipx.py rename to mic/kickstart/pykickstart/commands/skipx.py diff --git a/mic/pykickstart/commands/sshpw.py b/mic/kickstart/pykickstart/commands/sshpw.py similarity index 100% rename from mic/pykickstart/commands/sshpw.py rename to mic/kickstart/pykickstart/commands/sshpw.py diff --git a/mic/pykickstart/commands/timezone.py b/mic/kickstart/pykickstart/commands/timezone.py similarity index 100% rename from mic/pykickstart/commands/timezone.py rename to mic/kickstart/pykickstart/commands/timezone.py diff --git a/mic/pykickstart/commands/updates.py b/mic/kickstart/pykickstart/commands/updates.py similarity index 100% rename from mic/pykickstart/commands/updates.py rename to mic/kickstart/pykickstart/commands/updates.py diff --git a/mic/pykickstart/commands/upgrade.py b/mic/kickstart/pykickstart/commands/upgrade.py similarity index 100% rename from mic/pykickstart/commands/upgrade.py rename to mic/kickstart/pykickstart/commands/upgrade.py diff --git a/mic/pykickstart/commands/user.py b/mic/kickstart/pykickstart/commands/user.py similarity index 100% rename from mic/pykickstart/commands/user.py rename to mic/kickstart/pykickstart/commands/user.py diff --git a/mic/pykickstart/commands/vnc.py b/mic/kickstart/pykickstart/commands/vnc.py similarity index 100% rename from mic/pykickstart/commands/vnc.py rename to mic/kickstart/pykickstart/commands/vnc.py diff --git a/mic/pykickstart/commands/volgroup.py b/mic/kickstart/pykickstart/commands/volgroup.py similarity index 100% rename from mic/pykickstart/commands/volgroup.py rename to mic/kickstart/pykickstart/commands/volgroup.py diff --git a/mic/pykickstart/commands/xconfig.py b/mic/kickstart/pykickstart/commands/xconfig.py similarity index 100% rename from mic/pykickstart/commands/xconfig.py rename to mic/kickstart/pykickstart/commands/xconfig.py diff --git a/mic/pykickstart/commands/zerombr.py b/mic/kickstart/pykickstart/commands/zerombr.py similarity index 100% rename from mic/pykickstart/commands/zerombr.py rename to mic/kickstart/pykickstart/commands/zerombr.py diff --git a/mic/pykickstart/commands/zfcp.py b/mic/kickstart/pykickstart/commands/zfcp.py similarity index 100% rename from mic/pykickstart/commands/zfcp.py rename to mic/kickstart/pykickstart/commands/zfcp.py diff --git a/mic/pykickstart/constants.py b/mic/kickstart/pykickstart/constants.py similarity index 100% rename from mic/pykickstart/constants.py rename to mic/kickstart/pykickstart/constants.py diff --git a/mic/pykickstart/errors.py b/mic/kickstart/pykickstart/errors.py similarity index 100% rename from mic/pykickstart/errors.py rename to mic/kickstart/pykickstart/errors.py diff --git a/mic/pykickstart/__init__.py b/mic/kickstart/pykickstart/handlers/__init__.py similarity index 100% rename from mic/pykickstart/__init__.py rename to mic/kickstart/pykickstart/handlers/__init__.py diff --git a/mic/pykickstart/handlers/control.py b/mic/kickstart/pykickstart/handlers/control.py similarity index 100% rename from mic/pykickstart/handlers/control.py rename to mic/kickstart/pykickstart/handlers/control.py diff --git a/mic/pykickstart/handlers/f10.py b/mic/kickstart/pykickstart/handlers/f10.py similarity index 100% rename from mic/pykickstart/handlers/f10.py rename to mic/kickstart/pykickstart/handlers/f10.py diff --git a/mic/pykickstart/handlers/f11.py b/mic/kickstart/pykickstart/handlers/f11.py similarity index 100% rename from mic/pykickstart/handlers/f11.py rename to mic/kickstart/pykickstart/handlers/f11.py diff --git a/mic/pykickstart/handlers/f12.py b/mic/kickstart/pykickstart/handlers/f12.py similarity index 100% rename from mic/pykickstart/handlers/f12.py rename to mic/kickstart/pykickstart/handlers/f12.py diff --git a/mic/pykickstart/handlers/f13.py b/mic/kickstart/pykickstart/handlers/f13.py similarity index 100% rename from mic/pykickstart/handlers/f13.py rename to mic/kickstart/pykickstart/handlers/f13.py diff --git a/mic/pykickstart/handlers/f14.py b/mic/kickstart/pykickstart/handlers/f14.py similarity index 100% rename from mic/pykickstart/handlers/f14.py rename to mic/kickstart/pykickstart/handlers/f14.py diff --git a/mic/pykickstart/handlers/f15.py b/mic/kickstart/pykickstart/handlers/f15.py similarity index 100% rename from mic/pykickstart/handlers/f15.py rename to mic/kickstart/pykickstart/handlers/f15.py diff --git a/mic/pykickstart/handlers/f16.py b/mic/kickstart/pykickstart/handlers/f16.py similarity index 100% rename from mic/pykickstart/handlers/f16.py rename to mic/kickstart/pykickstart/handlers/f16.py diff --git a/mic/pykickstart/handlers/f7.py b/mic/kickstart/pykickstart/handlers/f7.py similarity index 100% rename from mic/pykickstart/handlers/f7.py rename to mic/kickstart/pykickstart/handlers/f7.py diff --git a/mic/pykickstart/handlers/f8.py b/mic/kickstart/pykickstart/handlers/f8.py similarity index 100% rename from mic/pykickstart/handlers/f8.py rename to mic/kickstart/pykickstart/handlers/f8.py diff --git a/mic/pykickstart/handlers/f9.py b/mic/kickstart/pykickstart/handlers/f9.py similarity index 100% rename from mic/pykickstart/handlers/f9.py rename to mic/kickstart/pykickstart/handlers/f9.py diff --git a/mic/pykickstart/handlers/fc3.py b/mic/kickstart/pykickstart/handlers/fc3.py similarity index 100% rename from mic/pykickstart/handlers/fc3.py rename to mic/kickstart/pykickstart/handlers/fc3.py diff --git a/mic/pykickstart/handlers/fc4.py b/mic/kickstart/pykickstart/handlers/fc4.py similarity index 100% rename from mic/pykickstart/handlers/fc4.py rename to mic/kickstart/pykickstart/handlers/fc4.py diff --git a/mic/pykickstart/handlers/fc5.py b/mic/kickstart/pykickstart/handlers/fc5.py similarity index 100% rename from mic/pykickstart/handlers/fc5.py rename to mic/kickstart/pykickstart/handlers/fc5.py diff --git a/mic/pykickstart/handlers/fc6.py b/mic/kickstart/pykickstart/handlers/fc6.py similarity index 100% rename from mic/pykickstart/handlers/fc6.py rename to mic/kickstart/pykickstart/handlers/fc6.py diff --git a/mic/pykickstart/handlers/rhel3.py b/mic/kickstart/pykickstart/handlers/rhel3.py similarity index 100% rename from mic/pykickstart/handlers/rhel3.py rename to mic/kickstart/pykickstart/handlers/rhel3.py diff --git a/mic/pykickstart/handlers/rhel4.py b/mic/kickstart/pykickstart/handlers/rhel4.py similarity index 100% rename from mic/pykickstart/handlers/rhel4.py rename to mic/kickstart/pykickstart/handlers/rhel4.py diff --git a/mic/pykickstart/handlers/rhel5.py b/mic/kickstart/pykickstart/handlers/rhel5.py similarity index 100% rename from mic/pykickstart/handlers/rhel5.py rename to mic/kickstart/pykickstart/handlers/rhel5.py diff --git a/mic/pykickstart/handlers/rhel6.py b/mic/kickstart/pykickstart/handlers/rhel6.py similarity index 100% rename from mic/pykickstart/handlers/rhel6.py rename to mic/kickstart/pykickstart/handlers/rhel6.py diff --git a/mic/pykickstart/ko.py b/mic/kickstart/pykickstart/ko.py similarity index 100% rename from mic/pykickstart/ko.py rename to mic/kickstart/pykickstart/ko.py diff --git a/mic/pykickstart/options.py b/mic/kickstart/pykickstart/options.py similarity index 100% rename from mic/pykickstart/options.py rename to mic/kickstart/pykickstart/options.py diff --git a/mic/pykickstart/parser.py b/mic/kickstart/pykickstart/parser.py similarity index 100% rename from mic/pykickstart/parser.py rename to mic/kickstart/pykickstart/parser.py diff --git a/mic/pykickstart/sections.py b/mic/kickstart/pykickstart/sections.py similarity index 100% rename from mic/pykickstart/sections.py rename to mic/kickstart/pykickstart/sections.py diff --git a/mic/pykickstart/version.py b/mic/kickstart/pykickstart/version.py similarity index 100% rename from mic/pykickstart/version.py rename to mic/kickstart/pykickstart/version.py diff --git a/mic/utils/kscommands/__init__.py b/mic/utils/kscommands/__init__.py deleted file mode 100644 index 1d63cc4..0000000 --- a/mic/utils/kscommands/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -try: - import pykickstart -except: - import mic - import sys - sys.path.insert(0, mic.__path__[0]) - import pykickstart - del(sys.path[0]) - -import desktop -import moblinrepo - -__all__ = ( - "Moblin_Desktop", - "Moblin_Repo", - "Moblin_RepoData", -) diff --git a/setup.py b/setup.py index 9da324a..1d3a17a 100644 --- a/setup.py +++ b/setup.py @@ -32,10 +32,15 @@ except IOError: PACKAGES = [MOD_NAME, MOD_NAME + '/utils', - MOD_NAME + '/utils/kscommands', MOD_NAME + '/imager', 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', ] + setup(name=MOD_NAME, version = version, description = 'New MeeGo Image Creator', -- 2.7.4