The integrated pykickstart modules is from latest git.
--- /dev/null
+import sys
+sys.path.append(os.path.dirname(__file__) or '.')
+import pykickstart
+
+import desktop
+import moblinrepo
+
+__all__ = (
+ "Moblin_Desktop",
+ "Moblin_Repo",
+ "Moblin_RepoData",
+)
# 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
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.
+++ /dev/null
-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",
-)
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',