summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJF Ding <jian-feng.ding@intel.com>2011-08-15 16:04:15 +0800
committerJF Ding <jian-feng.ding@intel.com>2011-08-15 16:04:15 +0800
commit65365f976ec1f93b53d8106b250de40427b9fef8 (patch)
tree34a9e889c8ece78dfad8877c8b752150ca041a26
parent81c0d1b3ad76e46bb76d4319ca93fc751d607dd5 (diff)
downloadmic-65365f976ec1f93b53d8106b250de40427b9fef8.tar.gz
mic-65365f976ec1f93b53d8106b250de40427b9fef8.tar.bz2
mic-65365f976ec1f93b53d8106b250de40427b9fef8.zip
rename all micng to mic
-rw-r--r--Makefile12
-rw-r--r--distfiles/mic.conf (renamed from distfiles/micng.conf)0
-rw-r--r--mic/__init__.py (renamed from micng/__init__.py)0
-rw-r--r--mic/__version__.py (renamed from micng/__version__.py)0
-rw-r--r--mic/chroot.py (renamed from micng/chroot.py)6
-rw-r--r--mic/configmgr.py (renamed from micng/configmgr.py)4
-rw-r--r--mic/creator.py (renamed from micng/creator.py)8
-rw-r--r--mic/imager/__init__.py (renamed from micng/imager/__init__.py)0
-rw-r--r--mic/imager/baseimager.py (renamed from micng/imager/baseimager.py)12
-rw-r--r--mic/imager/fs.py (renamed from micng/imager/fs.py)10
-rw-r--r--mic/imager/livecd.py (renamed from micng/imager/livecd.py)10
-rw-r--r--mic/imager/liveusb.py (renamed from micng/imager/liveusb.py)8
-rw-r--r--mic/imager/loop.py (renamed from micng/imager/loop.py)8
-rw-r--r--mic/imager/raw.py (renamed from micng/imager/raw.py)8
-rw-r--r--mic/pluginbase/__init__.py (renamed from micng/pluginbase/__init__.py)0
-rw-r--r--mic/pluginbase/backend_plugin.py (renamed from micng/pluginbase/backend_plugin.py)0
-rw-r--r--mic/pluginbase/hook_plugin.py (renamed from micng/pluginbase/hook_plugin.py)0
-rw-r--r--mic/pluginbase/imager_plugin.py (renamed from micng/pluginbase/imager_plugin.py)0
-rw-r--r--mic/pluginmgr.py (renamed from micng/pluginmgr.py)2
-rw-r--r--mic/utils/__init__.py (renamed from micng/utils/__init__.py)0
-rw-r--r--mic/utils/cmdln.py (renamed from micng/utils/cmdln.py)0
-rw-r--r--mic/utils/errors.py (renamed from micng/utils/errors.py)0
-rw-r--r--mic/utils/fs_related.py (renamed from micng/utils/fs_related.py)0
-rw-r--r--mic/utils/kickstart.py (renamed from micng/utils/kickstart.py)0
-rw-r--r--mic/utils/kscommands/__init__.py (renamed from micng/utils/kscommands/__init__.py)0
-rw-r--r--mic/utils/kscommands/desktop.py (renamed from micng/utils/kscommands/desktop.py)0
-rw-r--r--mic/utils/kscommands/micboot.py (renamed from micng/utils/kscommands/micboot.py)0
-rw-r--r--mic/utils/kscommands/moblinrepo.py (renamed from micng/utils/kscommands/moblinrepo.py)0
-rw-r--r--mic/utils/misc.py (renamed from micng/utils/misc.py)0
-rw-r--r--mic/utils/partitionedfs.py (renamed from micng/utils/partitionedfs.py)4
-rw-r--r--mic/utils/rpmmisc.py (renamed from micng/utils/rpmmisc.py)0
-rw-r--r--plugins/backend/yumpkgmgr.py8
-rw-r--r--plugins/backend/zypppkgmgr.py12
-rw-r--r--plugins/imager/fs_plugin.py14
-rw-r--r--plugins/imager/livecd_plugin.py18
-rw-r--r--plugins/imager/liveusb_plugin.py20
-rw-r--r--plugins/imager/loop_plugin.py18
-rw-r--r--plugins/imager/raw_plugin.py20
-rw-r--r--setup.py20
-rwxr-xr-xtools/mic (renamed from tools/micng)26
40 files changed, 120 insertions, 128 deletions
diff --git a/Makefile b/Makefile
index d167900..719293c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,7 @@ PYTHON ?= python
VERSION = $(shell cat VERSION)
TAGVER = $(shell cat VERSION | sed -e "s/\([0-9\.]*\).*/\1/")
-PKGNAME = micng
-
-PLUGIN_DIR = /usr/lib/micng/plugins
+PKGNAME = mic
ifeq ($(VERSION), $(TAGVER))
TAG = $(TAGVER)
@@ -27,13 +25,7 @@ dist-gz:
git archive --format=tar --prefix=$(PKGNAME)-$(TAGVER)/ $(TAG) | \
gzip > $(PKGNAME)-$(TAGVER).tar.gz
-install-plugins:
- install -d ${DESTDIR}/${PLUGIN_DIR}/imager
- install -m 644 plugins/imager/* ${DESTDIR}/${PLUGIN_DIR}/imager
- install -d ${DESTDIR}/${PLUGIN_DIR}/backend
- install -m 644 plugins/backend/* ${DESTDIR}/${PLUGIN_DIR}/backend
-
-install: all install-plugins
+install: all
$(PYTHON) setup.py install --prefix=$(DESTDIR)/$(PREFIX)
develop: all
diff --git a/distfiles/micng.conf b/distfiles/mic.conf
index 11f0d0f..11f0d0f 100644
--- a/distfiles/micng.conf
+++ b/distfiles/mic.conf
diff --git a/micng/__init__.py b/mic/__init__.py
index e69de29..e69de29 100644
--- a/micng/__init__.py
+++ b/mic/__init__.py
diff --git a/micng/__version__.py b/mic/__version__.py
index aa9bee7..aa9bee7 100644
--- a/micng/__version__.py
+++ b/mic/__version__.py
diff --git a/micng/chroot.py b/mic/chroot.py
index c322723..8a45121 100644
--- a/micng/chroot.py
+++ b/mic/chroot.py
@@ -5,9 +5,9 @@ import glob
import shutil
import shlex
import subprocess
-import micng.utils.fs_related as fs_related
-import micng.utils.misc as misc
-import micng.utils.errors as errors
+import mic.utils.fs_related as fs_related
+import mic.utils.misc as misc
+import mic.utils.errors as errors
def cleanup_after_chroot(targettype,imgmount,tmpdir,tmpmnt):
if imgmount and targettype == "img":
diff --git a/micng/configmgr.py b/mic/configmgr.py
index a6e2264..965c33d 100644
--- a/micng/configmgr.py
+++ b/mic/configmgr.py
@@ -3,12 +3,12 @@
import os
import sys
import logging
-import micng.utils as utils
+import mic.utils as utils
DEFAULT_OUTDIR='.'
DEFAULT_TMPDIR='/var/tmp'
DEFAULT_CACHEDIR='/var/cache'
-DEFAULT_GSITECONF='/etc/micng/micng.conf'
+DEFAULT_GSITECONF='/etc/mic/mic.conf'
class ConfigMgr(object):
def __init__(self, siteconf=None, ksconf=None):
diff --git a/micng/creator.py b/mic/creator.py
index 63664eb..3103ed2 100644
--- a/micng/creator.py
+++ b/mic/creator.py
@@ -7,9 +7,9 @@ import string
import optparse
import logging
-import micng.utils.cmdln as cmdln
-import micng.configmgr as configmgr
-import micng.pluginmgr as pluginmgr
+import mic.utils.cmdln as cmdln
+import mic.configmgr as configmgr
+import mic.pluginmgr as pluginmgr
class Creator(cmdln.Cmdln):
"""
@@ -17,7 +17,7 @@ class Creator(cmdln.Cmdln):
${help_list}
${option_list}
"""
- name = 'micng create(cr)'
+ name = 'mic create(cr)'
conf = None
man_header = None
man_footer = None
diff --git a/micng/imager/__init__.py b/mic/imager/__init__.py
index e69de29..e69de29 100644
--- a/micng/imager/__init__.py
+++ b/mic/imager/__init__.py
diff --git a/micng/imager/baseimager.py b/mic/imager/baseimager.py
index f3da977..5200d28 100644
--- a/micng/imager/baseimager.py
+++ b/mic/imager/baseimager.py
@@ -30,11 +30,11 @@ import glob
import rpm
-from micng.utils.errors import *
-from micng.utils.fs_related import *
-from micng.utils.rpmmisc import *
-from micng.utils.misc import *
-from micng.utils import kickstart
+from mic.utils.errors import *
+from mic.utils.fs_related import *
+from mic.utils.rpmmisc import *
+from mic.utils.misc import *
+from mic.utils import kickstart
class BaseImageCreator(object):
"""Installs a system to a chroot directory.
@@ -44,7 +44,7 @@ class BaseImageCreator(object):
e.g.
- import micng.imgcreate as imgcreate
+ import mic.imgcreate as imgcreate
ks = imgcreate.read_kickstart("foo.ks")
imgcreate.ImageCreator(ks, "foo").create()
diff --git a/micng/imager/fs.py b/mic/imager/fs.py
index b3e4749..e626e1c 100644
--- a/micng/imager/fs.py
+++ b/mic/imager/fs.py
@@ -30,11 +30,11 @@ import glob
import rpm
-from micng.utils.errors import *
-from micng.utils.fs_related import *
-from micng.utils import kickstart
-from micng.utils.rpmmisc import *
-from micng.utils.misc import *
+from mic.utils.errors import *
+from mic.utils.fs_related import *
+from mic.utils import kickstart
+from mic.utils.rpmmisc import *
+from mic.utils.misc import *
from baseimager import BaseImageCreator
diff --git a/micng/imager/livecd.py b/mic/imager/livecd.py
index 1717289..bf846cf 100644
--- a/micng/imager/livecd.py
+++ b/mic/imager/livecd.py
@@ -25,11 +25,11 @@ import logging
import re
import time
-import micng.utils.kickstart as kickstart
-import micng.utils.fs_related as fs_related
-import micng.utils.rpmmisc as rpmmisc
-import micng.utils.misc as misc
-from micng.utils.errors import *
+import mic.utils.kickstart as kickstart
+import mic.utils.fs_related as fs_related
+import mic.utils.rpmmisc as rpmmisc
+import mic.utils.misc as misc
+from mic.utils.errors import *
from loop import LoopImageCreator
class LiveImageCreatorBase(LoopImageCreator):
diff --git a/micng/imager/liveusb.py b/mic/imager/liveusb.py
index 3734ff4..eadc4dd 100644
--- a/micng/imager/liveusb.py
+++ b/mic/imager/liveusb.py
@@ -24,11 +24,11 @@ import logging
import re
import time
-import micng.utils.fs_related as fs_related
-import micng.utils.misc as misc
+import mic.utils.fs_related as fs_related
+import mic.utils.misc as misc
from livecd import LiveCDImageCreator
-from micng.utils.errors import *
-from micng.utils.partitionedfs import PartitionedMount
+from mic.utils.errors import *
+from mic.utils.partitionedfs import PartitionedMount
class LiveUSBImageCreator(LiveCDImageCreator):
def __init__(self, *args):
diff --git a/micng/imager/loop.py b/mic/imager/loop.py
index af604d6..cb02cc5 100644
--- a/micng/imager/loop.py
+++ b/mic/imager/loop.py
@@ -19,11 +19,11 @@
import os
import os.path
import subprocess
-import micng.utils.kickstart as kickstart
+import mic.utils.kickstart as kickstart
from baseimager import BaseImageCreator
-from micng.utils.errors import *
-from micng.utils.fs_related import *
-from micng.utils.misc import *
+from mic.utils.errors import *
+from mic.utils.fs_related import *
+from mic.utils.misc import *
FSLABEL_MAXLEN = 32
"""The maximum string length supported for LoopImageCreator.fslabel."""
diff --git a/micng/imager/raw.py b/mic/imager/raw.py
index ea59e11..b3aeae2 100644
--- a/micng/imager/raw.py
+++ b/mic/imager/raw.py
@@ -26,12 +26,12 @@ import tarfile
import subprocess
import logging
-import micng.utils.kickstart as kickstart
-import micng.utils.fs_related as fs_related
+import mic.utils.kickstart as kickstart
+import mic.utils.fs_related as fs_related
import urlgrabber.progress as progress
from baseimager import BaseImageCreator
-from micng.utils.partitionedfs import PartitionedMount
-from micng.utils.errors import *
+from mic.utils.partitionedfs import PartitionedMount
+from mic.utils.errors import *
class RawImageCreator(BaseImageCreator):
diff --git a/micng/pluginbase/__init__.py b/mic/pluginbase/__init__.py
index e69de29..e69de29 100644
--- a/micng/pluginbase/__init__.py
+++ b/mic/pluginbase/__init__.py
diff --git a/micng/pluginbase/backend_plugin.py b/mic/pluginbase/backend_plugin.py
index e132727..e132727 100644
--- a/micng/pluginbase/backend_plugin.py
+++ b/mic/pluginbase/backend_plugin.py
diff --git a/micng/pluginbase/hook_plugin.py b/mic/pluginbase/hook_plugin.py
index 764062c..764062c 100644
--- a/micng/pluginbase/hook_plugin.py
+++ b/mic/pluginbase/hook_plugin.py
diff --git a/micng/pluginbase/imager_plugin.py b/mic/pluginbase/imager_plugin.py
index 8dc749e..8dc749e 100644
--- a/micng/pluginbase/imager_plugin.py
+++ b/mic/pluginbase/imager_plugin.py
diff --git a/micng/pluginmgr.py b/mic/pluginmgr.py
index 95a2227..d6c29bf 100644
--- a/micng/pluginmgr.py
+++ b/mic/pluginmgr.py
@@ -3,7 +3,7 @@ import os
import sys
import logging
-DEFAULT_PLUGIN_LOCATION = "/usr/lib/micng/plugins"
+DEFAULT_PLUGIN_LOCATION = "/usr/lib/mic/plugins"
DEFINED_PLGUIN_TYPES = ["imager", "backend", "hook"]
STRING_PLUGIN_MARK = "mic_plugin"
STRING_PTYPE_MARK = "plugin_type"
diff --git a/micng/utils/__init__.py b/mic/utils/__init__.py
index 1e3cb68..1e3cb68 100644
--- a/micng/utils/__init__.py
+++ b/mic/utils/__init__.py
diff --git a/micng/utils/cmdln.py b/mic/utils/cmdln.py
index aa37fa9..aa37fa9 100644
--- a/micng/utils/cmdln.py
+++ b/mic/utils/cmdln.py
diff --git a/micng/utils/errors.py b/mic/utils/errors.py
index 3ce37f2..3ce37f2 100644
--- a/micng/utils/errors.py
+++ b/mic/utils/errors.py
diff --git a/micng/utils/fs_related.py b/mic/utils/fs_related.py
index ff2a07a..ff2a07a 100644
--- a/micng/utils/fs_related.py
+++ b/mic/utils/fs_related.py
diff --git a/micng/utils/kickstart.py b/mic/utils/kickstart.py
index 08cff12..08cff12 100644
--- a/micng/utils/kickstart.py
+++ b/mic/utils/kickstart.py
diff --git a/micng/utils/kscommands/__init__.py b/mic/utils/kscommands/__init__.py
index 7123ac1..7123ac1 100644
--- a/micng/utils/kscommands/__init__.py
+++ b/mic/utils/kscommands/__init__.py
diff --git a/micng/utils/kscommands/desktop.py b/mic/utils/kscommands/desktop.py
index dfa5250..dfa5250 100644
--- a/micng/utils/kscommands/desktop.py
+++ b/mic/utils/kscommands/desktop.py
diff --git a/micng/utils/kscommands/micboot.py b/mic/utils/kscommands/micboot.py
index 9e26dae..9e26dae 100644
--- a/micng/utils/kscommands/micboot.py
+++ b/mic/utils/kscommands/micboot.py
diff --git a/micng/utils/kscommands/moblinrepo.py b/mic/utils/kscommands/moblinrepo.py
index c022a0a..c022a0a 100644
--- a/micng/utils/kscommands/moblinrepo.py
+++ b/mic/utils/kscommands/moblinrepo.py
diff --git a/micng/utils/misc.py b/mic/utils/misc.py
index 40b38d2..40b38d2 100644
--- a/micng/utils/misc.py
+++ b/mic/utils/misc.py
diff --git a/micng/utils/partitionedfs.py b/mic/utils/partitionedfs.py
index c8abc0f..7124099 100644
--- a/micng/utils/partitionedfs.py
+++ b/mic/utils/partitionedfs.py
@@ -26,8 +26,8 @@ import subprocess
import logging
import time
-from micng.utils.errors import *
-from micng.utils.fs_related import *
+from mic.utils.errors import *
+from mic.utils.fs_related import *
class PartitionedMount(Mount):
def __init__(self, disks, mountdir, skipformat = False):
diff --git a/micng/utils/rpmmisc.py b/mic/utils/rpmmisc.py
index e1030c2..e1030c2 100644
--- a/micng/utils/rpmmisc.py
+++ b/mic/utils/rpmmisc.py
diff --git a/plugins/backend/yumpkgmgr.py b/plugins/backend/yumpkgmgr.py
index d75a08b..e9f620e 100644
--- a/plugins/backend/yumpkgmgr.py
+++ b/plugins/backend/yumpkgmgr.py
@@ -31,10 +31,10 @@ import tempfile
import shutil
import subprocess
-from micng.utils.errors import *
-from micng.utils.fs_related import *
-from micng.pluginbase.backend_plugin import BackendPlugin
-from micng.imager.baseimager import BaseImageCreator as ImageCreator
+from mic.utils.errors import *
+from mic.utils.fs_related import *
+from mic.pluginbase.backend_plugin import BackendPlugin
+from mic.imager.baseimager import BaseImageCreator as ImageCreator
class MyYumRepository(yum.yumRepo.YumRepository):
def __init__(self, repoid):
diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py
index b5d0b32..46122b9 100644
--- a/plugins/backend/zypppkgmgr.py
+++ b/plugins/backend/zypppkgmgr.py
@@ -11,12 +11,12 @@ import tempfile
import urlparse
import urllib2 as u2
import pykickstart.parser
-from micng.utils.errors import *
-from micng.imager.baseimager import BaseImageCreator as ImageCreator
-from micng.utils.fs_related import *
-from micng.utils.misc import *
-from micng.utils.rpmmisc import *
-from micng.pluginbase.backend_plugin import BackendPlugin
+from mic.utils.errors import *
+from mic.imager.baseimager import BaseImageCreator as ImageCreator
+from mic.utils.fs_related import *
+from mic.utils.misc import *
+from mic.utils.rpmmisc import *
+from mic.pluginbase.backend_plugin import BackendPlugin
class RepositoryStub:
def __init__(self):
diff --git a/plugins/imager/fs_plugin.py b/plugins/imager/fs_plugin.py
index e40e1fd..d53e316 100644
--- a/plugins/imager/fs_plugin.py
+++ b/plugins/imager/fs_plugin.py
@@ -3,13 +3,13 @@ import sys
import subprocess
import logging
-from micng.pluginbase.imager_plugin import ImagerPlugin
-import micng.utils.cmdln as cmdln
-import micng.utils.errors as errors
-import micng.configmgr as configmgr
-import micng.pluginmgr as pluginmgr
-import micng.imager.fs as fs
-import micng.chroot as chroot
+from mic.pluginbase.imager_plugin import ImagerPlugin
+import mic.utils.cmdln as cmdln
+import mic.utils.errors as errors
+import mic.configmgr as configmgr
+import mic.pluginmgr as pluginmgr
+import mic.imager.fs as fs
+import mic.chroot as chroot
class FsPlugin(ImagerPlugin):
diff --git a/plugins/imager/livecd_plugin.py b/plugins/imager/livecd_plugin.py
index c98a0cc..3a63c4d 100644
--- a/plugins/imager/livecd_plugin.py
+++ b/plugins/imager/livecd_plugin.py
@@ -6,15 +6,15 @@ import logging
import shutil
import tempfile
-from micng.pluginbase.imager_plugin import ImagerPlugin
-import micng.chroot as chroot
-import micng.utils.misc as misc
-import micng.utils.fs_related as fs_related
-import micng.utils.cmdln as cmdln
-import micng.configmgr as configmgr
-import micng.pluginmgr as pluginmgr
-import micng.imager.livecd as livecd
-from micng.utils.errors import *
+from mic.pluginbase.imager_plugin import ImagerPlugin
+import mic.chroot as chroot
+import mic.utils.misc as misc
+import mic.utils.fs_related as fs_related
+import mic.utils.cmdln as cmdln
+import mic.configmgr as configmgr
+import mic.pluginmgr as pluginmgr
+import mic.imager.livecd as livecd
+from mic.utils.errors import *
class LiveCDPlugin(ImagerPlugin):
diff --git a/plugins/imager/liveusb_plugin.py b/plugins/imager/liveusb_plugin.py
index 33af1a6..2162202 100644
--- a/plugins/imager/liveusb_plugin.py
+++ b/plugins/imager/liveusb_plugin.py
@@ -6,16 +6,16 @@ import logging
import shutil
import tempfile
-from micng.pluginbase.imager_plugin import ImagerPlugin
-import micng.imager.liveusb as liveusb
-import micng.utils.misc as misc
-import micng.utils.fs_related as fs_related
-import micng.utils.cmdln as cmdln
-import micng.configmgr as configmgr
-import micng.pluginmgr as pluginmgr
-from micng.utils.partitionedfs import PartitionedMount
-from micng.utils.errors import *
-import micng.chroot as chroot
+from mic.pluginbase.imager_plugin import ImagerPlugin
+import mic.imager.liveusb as liveusb
+import mic.utils.misc as misc
+import mic.utils.fs_related as fs_related
+import mic.utils.cmdln as cmdln
+import mic.configmgr as configmgr
+import mic.pluginmgr as pluginmgr
+from mic.utils.partitionedfs import PartitionedMount
+from mic.utils.errors import *
+import mic.chroot as chroot
class LiveUSBPlugin(ImagerPlugin):
#@cmdln.option
diff --git a/plugins/imager/loop_plugin.py b/plugins/imager/loop_plugin.py
index f743b6b..37b3227 100644
--- a/plugins/imager/loop_plugin.py
+++ b/plugins/imager/loop_plugin.py
@@ -6,15 +6,15 @@ import logging
import shutil
import tempfile
-from micng.pluginbase.imager_plugin import ImagerPlugin
-import micng.utils.misc as misc
-import micng.utils.cmdln as cmdln
-import micng.utils.fs_related as fs_related
-from micng.utils.errors import *
-import micng.configmgr as configmgr
-import micng.pluginmgr as pluginmgr
-import micng.imager.loop as loop
-import micng.chroot as chroot
+from mic.pluginbase.imager_plugin import ImagerPlugin
+import mic.utils.misc as misc
+import mic.utils.cmdln as cmdln
+import mic.utils.fs_related as fs_related
+from mic.utils.errors import *
+import mic.configmgr as configmgr
+import mic.pluginmgr as pluginmgr
+import mic.imager.loop as loop
+import mic.chroot as chroot
class LoopPlugin(ImagerPlugin):
@classmethod
diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py
index bdb9076..2453ca3 100644
--- a/plugins/imager/raw_plugin.py
+++ b/plugins/imager/raw_plugin.py
@@ -7,16 +7,16 @@ import shutil
import re
import tempfile
-from micng.pluginbase.imager_plugin import ImagerPlugin
-import micng.utils.misc as misc
-import micng.utils.fs_related as fs_related
-import micng.utils.cmdln as cmdln
-from micng.utils.errors import *
-from micng.utils.partitionedfs import PartitionedMount
-import micng.configmgr as configmgr
-import micng.pluginmgr as pluginmgr
-import micng.imager.raw as raw
-import micng.chroot as chroot
+from mic.pluginbase.imager_plugin import ImagerPlugin
+import mic.utils.misc as misc
+import mic.utils.fs_related as fs_related
+import mic.utils.cmdln as cmdln
+from mic.utils.errors import *
+from mic.utils.partitionedfs import PartitionedMount
+import mic.configmgr as configmgr
+import mic.pluginmgr as pluginmgr
+import mic.imager.raw as raw
+import mic.chroot as chroot
class RawPlugin(ImagerPlugin):
diff --git a/setup.py b/setup.py
index 157116c..9da324a 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ from distutils.core import setup
#except ImportError:
# pass
-MOD_NAME = 'micng'
+MOD_NAME = 'mic'
version_path = 'VERSION'
if not os.path.isfile(version_path):
@@ -43,16 +43,16 @@ setup(name=MOD_NAME,
author_email='jian-feng.ding@intel.com',
url='https://meego.gitorious.org/meego-developer-tools/image-creator',
scripts=[
- 'tools/micng',
+ 'tools/mic',
],
packages = PACKAGES,
- data_files = [("/usr/lib/micng/plugins/imager", ["plugins/imager/fs_plugin.py",
- "plugins/imager/livecd_plugin.py",
- "plugins/imager/liveusb_plugin.py",
- "plugins/imager/loop_plugin.py",
- "plugins/imager/raw_plugin.py"]),
- ("/usr/lib/micng/plugins/backend", ["plugins/backend/zypppkgmgr.py",
- "plugins/backend/yumpkgmgr.py"]),
- ("/etc/micng", ["distfiles/micng.conf"])]
+ data_files = [("/usr/lib/mic/plugins/imager", ["plugins/imager/fs_plugin.py",
+ "plugins/imager/livecd_plugin.py",
+ "plugins/imager/liveusb_plugin.py",
+ "plugins/imager/loop_plugin.py",
+ "plugins/imager/raw_plugin.py"]),
+ ("/usr/lib/mic/plugins/backend", ["plugins/backend/zypppkgmgr.py",
+ "plugins/backend/yumpkgmgr.py"]),
+ ("/etc/mic", ["distfiles/mic.conf"])]
)
diff --git a/tools/micng b/tools/mic
index 66ae785..8b54f45 100755
--- a/tools/micng
+++ b/tools/mic
@@ -3,15 +3,15 @@
import os
import sys
import logging
-import micng.utils.cmdln as cmdln
-import micng.utils.misc as misc
-import micng.utils.errors as errors
-import micng.configmgr as configmgr
-import micng.pluginmgr as pluginmgr
-import micng.creator as creator
+import mic.utils.cmdln as cmdln
+import mic.utils.misc as misc
+import mic.utils.errors as errors
+import mic.configmgr as configmgr
+import mic.pluginmgr as pluginmgr
+import mic.creator as creator
-class Micng(cmdln.Cmdln):
- """Usage: micng SUBCOMMAND [OPTS] [ARGS...]
+class Mic(cmdln.Cmdln):
+ """Usage: mic SUBCOMMAND [OPTS] [ARGS...]
MeeGo Image Creator Tool.
@@ -21,7 +21,7 @@ class Micng(cmdln.Cmdln):
For additional information, see
* http://www.meego.com/
"""
- name = 'micng'
+ name = 'mic'
version = None
@cmdln.alias("cr")
@@ -40,7 +40,7 @@ class Micng(cmdln.Cmdln):
"""${cmd_name}: convert an image format to another one
usage:
- micng convert <imagefile> <destformat>
+ mic convert <imagefile> <destformat>
"""
if len(args) == 0:
self.emptyline()
@@ -86,7 +86,7 @@ class Micng(cmdln.Cmdln):
"""${cmd_name}: chroot an image
usage:
- micng chroot <imagefile>
+ mic chroot <imagefile>
${cmd_option_list}
"""
@@ -130,9 +130,9 @@ class Micng(cmdln.Cmdln):
if __name__ == "__main__":
logging.getLogger().setLevel(logging.ERROR)
- micng = Micng()
+ mic = Mic()
try:
- ret = micng.main()
+ ret = mic.main()
except errors.CreatorError, msg:
ret = 2
print >> sys.stderr, msg