[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5018/8267] wic: filemap: Fixed spared_copy skip

[Emmanuele Bassi <ebassi src gnome org>]

commit 8dddce21c4613e3cda5ec5d3c83e6ed1d9ef44ea
Author: Daniel Schultz <d schultz phytec de>
Date:   Tue Mar 7 14:41:56 2017 +0100

    wic: filemap: Fixed spared_copy skip
    
    This patches removes the empty space in front of the copied file which
    was skipped. Without this reduction it's not possible to place a
    partition with rawcopy and skip parameter on a desired alignment.
    
    (From OE-Core rev: 5c024d71f9413b81ee1707dbc41f0721f8f27bdb)
    
    Signed-off-by: Daniel Schultz <d schultz phytec de>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/filemap.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py
index f3240ba..162603e 100644
--- a/scripts/lib/wic/filemap.py
+++ b/scripts/lib/wic/filemap.py
@@ -543,9 +543,9 @@ def sparse_copy(src_fname, dst_fname, offset=0, skip=0):
         end = (last + 1) * fmap.block_size
 
         if start < skip < end:
-            start = skip
-
-        fmap._f_image.seek(start, os.SEEK_SET)
+            fmap._f_image.seek(skip, os.SEEK_SET)
+        else:
+            fmap._f_image.seek(start, os.SEEK_SET)
         dst_file.seek(offset + start, os.SEEK_SET)
 
         chunk_size = 1024 * 1024