From e0f308119a330dc2d017cf8839ba788183bc8d47 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Wed, 26 Jun 2013 12:08:49 +0300 Subject: [PATCH] baseimager: move environment variable definitions It is cleaner to have a single place where we define all the environement variables. Move a couple of historical variables to the '_get_post_scripts_env()' function. Change-Id: I58e5d2dbe4477effccf254c48a1f74ccad484c8c Signed-off-by: Artem Bityutskiy --- mic/imager/baseimager.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py index 39bb6dd..fed1ad7 100644 --- a/mic/imager/baseimager.py +++ b/mic/imager/baseimager.py @@ -463,6 +463,11 @@ class BaseImageCreator(object): # Name of the image creation tool env[self.installerfw_prefix + "INSTALLER_NAME"] = "mic" + # These are historical variables which lack the common name prefix + if not in_chroot: + env["INSTALL_ROOT"] = self._instroot + env["IMG_NAME"] = self._name + return env def __get_imgname(self): @@ -1055,8 +1060,6 @@ class BaseImageCreator(object): env = self._get_post_scripts_env(s.inChroot) if not s.inChroot: - env["INSTALL_ROOT"] = self._instroot - env["IMG_NAME"] = self._name preexec = None script = path else: -- 2.7.4