summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatarzyna Gorska <k.gorska@samsung.com>2017-08-29 14:02:11 +0200
committerKatarzyna Gorska <k.gorska@samsung.com>2017-11-10 11:50:58 +0100
commit13d5bf8eeacf710c68febc37408f985e58ed12f7 (patch)
treec22a794138d5f0d3bbcfd53c25dd4d1cd868a1da
parent8592bd142d61b9084aad5b2ac0043bb93710badc (diff)
downloadkickstarter-13d5bf8eeacf710c68febc37408f985e58ed12f7.tar.gz
kickstarter-13d5bf8eeacf710c68febc37408f985e58ed12f7.tar.bz2
kickstarter-13d5bf8eeacf710c68febc37408f985e58ed12f7.zip
Kickstarter was not able to correctly parse config files that contained a list of partition files in "Part" section. Now it is possible to add several partition files in that section. Change-Id: Idcb22bd6bcb17061b9c7b5af8dea222283216e2c Signed-off-by: Katarzyna Gorska <k.gorska@samsung.com>
-rw-r--r--kswriter/KSWriter.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/kswriter/KSWriter.py b/kswriter/KSWriter.py
index b5e97a3..bae1e36 100644
--- a/kswriter/KSWriter.py
+++ b/kswriter/KSWriter.py
@@ -138,9 +138,19 @@ class KSWriter():
ptab = ""
for g in [ plat, img ]:
if g.has_key("Part"):
- f = open("%s/partitions/%s" %(meta_root, g['Part']) )
- ptab = f.read()
- f.close()
+ if type(g['Part']) == str:
+ t = [g['Part']]
+ elif type(g['Part']) == list:
+ t = g['Part']
+ ptab = ""
+ for p in t:
+ if os.path.exists('%s/partitions/%s' %(meta_root,p)):
+ f = open("%s/partitions/%s" %(meta_root, p) )
+ ptab += f.read()
+ ptab += "\n"
+ f.close()
+ else:
+ raise KSMetaError('%s/partitions/%s.run not found, aborting.' %(meta_root,p))
conf['Part'] = ptab
conf['Post'] = postscript