[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6860/8267] wic: fix calculation of partition number

[Emmanuele Bassi <ebassi src gnome org>]

commit 8fb8a21b7d4f1fb69f0407f03fd5907d861f7d42
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Mon Jul 17 10:04:04 2017 +0300

    wic: fix calculation of partition number
    
    Total number of partitions should be taken into account when calculating
    real partition number for msdos partition table. The number can be
    different for the 4th partition: it can be 4 if there are 4 partitions in
    the table and 5 if there are more than 4 partitions in the table. In the
    latter case number 4 is occupied by extended partition.
    
    [YOCTO #11790]
    
    (From OE-Core rev: 5689139b3cd862e2df49f6b21171f513e8a46c60)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/imager/direct.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index aa9cc9f..f20d843 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -313,7 +313,7 @@ class PartitionedImage():
                 part.realnum = 0
             else:
                 realnum += 1
-                if self.ptable_format == 'msdos' and realnum > 3:
+                if self.ptable_format == 'msdos' and realnum > 3 and len(partitions) > 4:
                     part.realnum = realnum + 1
                     continue
                 part.realnum = realnum