[oe-commits] [openembedded-core] 06/06: wic/engine: dump the partition table in JSON format only

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 49e7f3e8e3a775510d8b0e2826a06d000934706b
Author: Pierre-Jean Texier <pjtexier at koncepto.io>
AuthorDate: Sat Feb 29 21:38:02 2020 +0100

    wic/engine: dump the partition table in JSON format only
    
    since commit 03154d2cf25c1d5ce908da9e72d324004b8d5722 ("sfdisk: add -J between mutually exclusive options")
    in util-linux [1], the '-J' can't be used with the '-d' option anymore.
    
    So, since we're using json format output, drop the '-d' option.
    
    Fixes:
    
    ERROR: _exec_cmd: <snip>/usr/sbin/sfdisk -dJ <snip>/core-image-minimal-qemux86-64.wic returned '1' instead of 0
    output: sfdisk: mutually exclusive arguments: --list-free --json --dump
    
    [1] - https://github.com/karelzak/util-linux/commit/03154d2cf25c1d5ce908da9e72d324004b8d5722#diff-31d5cc325380dbdafe64d0e019846f12
    
    Signed-off-by: Pierre-Jean Texier <pjtexier at koncepto.io>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/wic/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 2479751..83c42c9 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -439,7 +439,7 @@ class Disk:
             outf.flush()
 
         def read_ptable(path):
-            out = exec_cmd("{} -dJ {}".format(self.sfdisk, path))
+            out = exec_cmd("{} -J {}".format(self.sfdisk, path))
             return json.loads(out)
 
         def write_ptable(parts, target):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.