diff options
| author | Gui Chen <gui.chen@intel.com> | 2012-12-19 14:42:48 +0800 |
|---|---|---|
| committer | Gui Chen <gui.chen@intel.com> | 2012-12-19 14:42:48 +0800 |
| commit | f20bfb944246f5f6f89963d1f41f32ac6dc19acf (patch) | |
| tree | 0767057396e10d42fc5ba4214546c903f4bae6fb /plugins | |
| parent | aaee947d5ad2c0efdbcb270346c5176647686c88 (diff) | |
| parent | a4253604bfc4c6e35085e0f74580ac09c4a55fc1 (diff) | |
| download | mic-f20bfb944246f5f6f89963d1f41f32ac6dc19acf.tar.gz mic-f20bfb944246f5f6f89963d1f41f32ac6dc19acf.tar.bz2 mic-f20bfb944246f5f6f89963d1f41f32ac6dc19acf.zip | |
Merge branch 'release-0.15' into devel
Conflicts:
etc/bootstrap.conf
mic/bootstrap.py
mic/creator.py
mic/imager/raw.py
mic/msger.py
mic/utils/misc.py
setup.py
Signed-off-by: Gui Chen <gui.chen@intel.com>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/backend/yumpkgmgr.py | 9 | ||||
| -rwxr-xr-x | plugins/backend/zypppkgmgr.py | 2 | ||||
| -rw-r--r-- | plugins/imager/fs_plugin.py | 2 | ||||
| -rw-r--r-- | plugins/imager/livecd_plugin.py | 2 | ||||
| -rw-r--r-- | plugins/imager/liveusb_plugin.py | 2 | ||||
| -rw-r--r-- | plugins/imager/loop_plugin.py | 2 | ||||
| -rw-r--r-- | plugins/imager/raw_plugin.py | 2 |
7 files changed, 13 insertions, 8 deletions
diff --git a/plugins/backend/yumpkgmgr.py b/plugins/backend/yumpkgmgr.py index 90f9c77..33e354e 100644 --- a/plugins/backend/yumpkgmgr.py +++ b/plugins/backend/yumpkgmgr.py @@ -68,9 +68,12 @@ class MyYumRepository(yum.yumRepo.YumRepository): m2c_connection = None if not self.sslverify: - import M2Crypto - m2c_connection = M2Crypto.SSL.Connection.clientPostConnectionCheck - M2Crypto.SSL.Connection.clientPostConnectionCheck = None + try: + import M2Crypto + m2c_connection = M2Crypto.SSL.Connection.clientPostConnectionCheck + M2Crypto.SSL.Connection.clientPostConnectionCheck = None + except ImportError, err: + raise CreatorError("%s, please try to install python-m2crypto" % str(err)) proxy = None if url: diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py index 7e76089..9c6126a 100755 --- a/plugins/backend/zypppkgmgr.py +++ b/plugins/backend/zypppkgmgr.py @@ -678,6 +678,8 @@ class Zypp(BackendPlugin): if not self.ts: self.__initialize_transaction() + # clean rpm lock + self._cleanupRpmdbLocks(self.instroot) # Set filters probfilter = 0 for flag in self.probFilterFlags: diff --git a/plugins/imager/fs_plugin.py b/plugins/imager/fs_plugin.py index 47df1bb..6801def 100644 --- a/plugins/imager/fs_plugin.py +++ b/plugins/imager/fs_plugin.py @@ -49,7 +49,7 @@ class FsPlugin(ImagerPlugin): creatoropts = configmgr.create ksconf = args[0] - if configmgr.bootstrap['enable']: + if creatoropts['runtime'] == 'bootstrap': configmgr._ksconf = ksconf rt_util.bootstrap_mic() diff --git a/plugins/imager/livecd_plugin.py b/plugins/imager/livecd_plugin.py index 26c2d11..5782e13 100644 --- a/plugins/imager/livecd_plugin.py +++ b/plugins/imager/livecd_plugin.py @@ -45,7 +45,7 @@ class LiveCDPlugin(ImagerPlugin): creatoropts = configmgr.create ksconf = args[0] - if configmgr.bootstrap['enable']: + if creatoropts['runtime'] == 'bootstrap': configmgr._ksconf = ksconf rt_util.bootstrap_mic() diff --git a/plugins/imager/liveusb_plugin.py b/plugins/imager/liveusb_plugin.py index babcfa6..6a12834 100644 --- a/plugins/imager/liveusb_plugin.py +++ b/plugins/imager/liveusb_plugin.py @@ -47,7 +47,7 @@ class LiveUSBPlugin(ImagerPlugin): creatoropts = configmgr.create ksconf = args[0] - if configmgr.bootstrap['enable']: + if creatoropts['runtime'] == "bootstrap": configmgr._ksconf = ksconf rt_util.bootstrap_mic() diff --git a/plugins/imager/loop_plugin.py b/plugins/imager/loop_plugin.py index 7e3141f..8872206 100644 --- a/plugins/imager/loop_plugin.py +++ b/plugins/imager/loop_plugin.py @@ -54,7 +54,7 @@ class LoopPlugin(ImagerPlugin): creatoropts = configmgr.create ksconf = args[0] - if configmgr.bootstrap['enable']: + if creatoropts['runtime'] == "bootstrap": configmgr._ksconf = ksconf rt_util.bootstrap_mic() diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py index 5c8be60..bcc3f55 100644 --- a/plugins/imager/raw_plugin.py +++ b/plugins/imager/raw_plugin.py @@ -56,7 +56,7 @@ class RawPlugin(ImagerPlugin): creatoropts = configmgr.create ksconf = args[0] - if configmgr.bootstrap['enable']: + if creatoropts['runtime'] == "bootstrap": configmgr._ksconf = ksconf rt_util.bootstrap_mic() |