From 176fd97e7fa32ea73e54c135d91caac23e6812c3 Mon Sep 17 00:00:00 2001 From: Shuangquan Zhou Date: Wed, 21 Sep 2011 16:40:07 +0800 Subject: [PATCH] Fixed a issue about 'include_src' --- mic/imager/baseimager.py | 3 +-- mic/imager/fs.py | 1 + plugins/imager/fs_plugin.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py index 57f53be..ebfec54 100644 --- a/mic/imager/baseimager.py +++ b/mic/imager/baseimager.py @@ -107,7 +107,6 @@ class BaseImageCreator(object): self.__img_compression_method = None self._recording_pkgs = None - self._include_src = None # available size in root fs, init to 0 self._root_fs_avail = 0 @@ -807,7 +806,7 @@ class BaseImageCreator(object): yum_conf = self._mktemp(prefix = "yum.conf-") keep_record = None - if self._include_src: + if hasattr(self, '_include_src') and self._include_src: keep_record = 'include_src' if self._recording_pkgs in ('name', 'content'): keep_record = self._recording_pkgs diff --git a/mic/imager/fs.py b/mic/imager/fs.py index a902f57..ec7f7c6 100644 --- a/mic/imager/fs.py +++ b/mic/imager/fs.py @@ -28,6 +28,7 @@ class FsImageCreator(BaseImageCreator): BaseImageCreator.__init__(self, cfgmgr, pkgmgr) self._fstype = None self._fsopts = None + self._include_src = False def package(self, destdir = "."): fsdir = os.path.join(destdir, self.name) diff --git a/plugins/imager/fs_plugin.py b/plugins/imager/fs_plugin.py index 40da7a4..971adca 100644 --- a/plugins/imager/fs_plugin.py +++ b/plugins/imager/fs_plugin.py @@ -65,6 +65,7 @@ class FsPlugin(ImagerPlugin): raise errors.CreatorError("Can't find backend plugin: %s" % createopts['pkgmgr']) creator = fs.FsImageCreator(createopts, pkgmgr) + creator._include_src = opts.include_src if recording_pkgs is not None: creator._recording_pkgs = recording_pkgs -- 2.7.4