From 5ff2eb8a84a437ced589d597a6a925585fa6861d Mon Sep 17 00:00:00 2001
From: rzaitov <r-zaitov@yandex.ru>
Date: Fri, 1 Nov 2013 12:37:01 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20=D0=B4=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B9=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B7=D0=B0=D0=BF=D1=83?=
 =?UTF-8?q?=D1=81=D0=BA=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/StepRunner/StepsRunner.py            | 4 ++--
 scripts/utils/configs/BuildConfigProvider.py | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/StepRunner/StepsRunner.py b/scripts/StepRunner/StepsRunner.py
index ceadc70..e56f802 100644
--- a/scripts/StepRunner/StepsRunner.py
+++ b/scripts/StepRunner/StepsRunner.py
@@ -16,8 +16,8 @@ class StepsRunner:
 				continue
 			if stripped.startswith("#"):
 				continue
-
-			self.processLine(stripped)
+			else:
+				self.processLine(stripped)
 
 	def processLine(self, line):
 		if self.shCommandBuilder.isShCommand(line):
diff --git a/scripts/utils/configs/BuildConfigProvider.py b/scripts/utils/configs/BuildConfigProvider.py
index 02c3f07..bdc1af7 100644
--- a/scripts/utils/configs/BuildConfigProvider.py
+++ b/scripts/utils/configs/BuildConfigProvider.py
@@ -6,7 +6,8 @@ class BuildConfigProvider:
 		configs = []
 		for l in leafs:
 			config = self.fetchConfigFromLeafWrapper(l)
-			configs.append(config)
+			if config.get('build_ready', 'false') == 'true':
+				configs.append(config)
 
 		return configs
 
@@ -32,7 +33,11 @@ class BuildConfigProvider:
 
 		unionConf = {}
 		for a in ancestors:
-			unionConf.update(a['dict'])
+			dictionary = a['dict']
+			for k in dictionary:
+				value = dictionary[k]
+				if type(value) is str:
+					unionConf[k] = value
 
 		return unionConf