From cc2233b51f1d22d4e540f4a3e9ceedd7ede9ffa9 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 19 Jan 2016 18:51:04 +0200 Subject: wic: use unique partition number This is a preparation for 'include' support. Used unique counter instead of line number for partitions in .ks file. Line numbers can be equal for different .ks files, which can cause problems if one .ks file is included into another. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/ksparser.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index e366f61e0f..0191a8474e 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -84,6 +84,7 @@ class KickStart(object): self.partitions = [] self.bootloader = None self.lineno = 0 + self.partnum = 0 parser = KickStartParser() subparsers = parser.add_subparsers() @@ -130,7 +131,8 @@ class KickStart(object): raise KickStartError('%s:%d: %s' % \ (confpath, lineno, err)) if line.startswith('part'): - self.partitions.append(Partition(parsed, lineno)) + self.partnum += 1 + self.partitions.append(Partition(parsed, self.partnum)) else: if not self.bootloader: self.bootloader = parsed -- cgit 1.2.3-korg