[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4057/8267] wic: partitionedfs: account for non-table partitions when checking if logical parititon is needed

[Emmanuele Bassi <ebassi src gnome org>]

commit cb10cfd64f25ad902a67997eb6a98dcfa0918cea
Author: Maciej Borzecki <maciej borzecki rndity com>
Date:   Mon Jan 16 11:41:51 2017 +0100

    wic: partitionedfs: account for non-table partitions when checking if logical parititon is needed
    
    Commit 8c1c43b7901a9fcd8b279eb4250b08157ad345b7 `wic: Create a logical partition
    only when it is really mandatory` did not account for partitions that are not
    present in partition table.
    
    (From OE-Core rev: 57b05e924bba7b2fff07a34690474c0fa3046865)
    
    Signed-off-by: Maciej Borzecki <maciej borzecki rndity com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/utils/partitionedfs.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 68301f0..721d514 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -201,7 +201,8 @@ class Image():
                 part['num'] = 0
 
             if disk['ptable_format'] == "msdos":
-                if len(self.partitions) > 4:
+                # only count the partitions that are in partition table
+                if len([p for p in self.partitions if not p['no_table']]) > 4:
                     if disk['realpart'] > 3:
                         part['type'] = 'logical'
                         part['num'] = disk['realpart'] + 1