sablink/molecule-plugins
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[plugins/mmc] always export CHROOT_DIR when it makes sense

Browse Source
This commit is contained in:
Fabio Erculiani
2011-12-29 17:11:24 +01:00
parent ba10920838
commit e6a5c888f8
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
molecule/specs/plugins/mmc_plugin.py
+6
View File
@@ -134,9 +134,11 @@ class ImageHandler(GenericExecutionStep, BuiltinHandlerMixin):
self.image_mb = 0
self._tmp_image_file_fd = None
self._tmp_image_file = None
self.source_dir = None
def setup(self):
self.source_dir = self.metadata['source_chroot']
self.image_mb = self.metadata['image_mb']
try:
@@ -166,6 +168,7 @@ class ImageHandler(GenericExecutionStep, BuiltinHandlerMixin):
exec_script = self.metadata.get('pre_image_script')
if exec_script:
env = os.environ.copy()
env['CHROOT_DIR'] = self.source_dir
self._output.output("[%s|%s] %s: %s" % (
blue("ImageHandler"), darkred(self.spec_name),
_("spawning"), " ".join(exec_script),
@@ -259,8 +262,10 @@ class FinalImageHandler(GenericExecutionStep, BuiltinHandlerMixin):
GenericExecutionStep.__init__(self, *args, **kwargs)
self.dest_path = None
self._tmp_image_file = None
self.source_dir = None
def setup(self):
self.source_dir = self.metadata['source_chroot']
self._tmp_image_file = self.metadata['MmcImageHandler_image_file']
image_name = self.metadata.get('image_name')
@@ -320,6 +325,7 @@ class FinalImageHandler(GenericExecutionStep, BuiltinHandlerMixin):
exec_script = self.metadata.get('post_image_script')
if exec_script:
env = os.environ.copy()
env['CHROOT_DIR'] = self.source_dir
env['IMAGE_PATH'] = self.dest_path
env['IMAGE_CHECKSUM_PATH'] = self.dest_path + \
FinalImageHandler.MD5_EXT