From: Slava Barinov <v.barinov@samsung.com>
Date: Tue, 4 Dec 2018 07:02:40 +0000 (+0300)
Subject: Add condition for %env section backward compatibility
X-Git-Tag: submit/tizen/20181204.094226^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F194411%2F4;p=platform%2Fupstream%2Fkickstarter.git

Add condition for %env section backward compatibility

Change-Id: I5281f4ec6359f0e3f582ad1cfc6939da4ff134a3
Signed-off-by: Slava Barinov <v.barinov@samsung.com>
---

diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl
index 54c9a8b..52c8aae 100644
--- a/kickstart/kickstart.tmpl
+++ b/kickstart/kickstart.tmpl
@@ -87,9 +87,11 @@ repo --name=${r} --baseurl=${rr.Url} ${options_repo}
 #end for
 #end for
 
+#if $metadata.has_key("Env")
 %env
 ${metadata.Env}
 %end
+#endif
 
 #if $metadata.has_key("PackageArgs")
 %packages --${metadata.PackageArgs}
diff --git a/kswriter/KSWriter.py b/kswriter/KSWriter.py
index a15ed63..9449eb4 100644
--- a/kswriter/KSWriter.py
+++ b/kswriter/KSWriter.py
@@ -166,7 +166,8 @@ class KSWriter():
         conf['Post'] = postscript
         conf['NoChroot'] = nochrootscript
         conf['Run'] = runscript
-        conf['Env'] = envscript
+        if envscript:
+            conf['Env'] = envscript
         return conf
 
     def process_files(self,  meta,  repos):