[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5017/8267] wic: plugins: rawcopy: Fixed wrong variable type



commit 52de84763d4eff2c7336066bcb3fde92cb413a11
Author: Daniel Schultz <d schultz phytec de>
Date:   Tue Mar 7 14:41:55 2017 +0100

    wic: plugins: rawcopy: Fixed wrong variable type
    
    Without the int() function this variable will be a string. This will led
    to a error in Filemap on line 545 due wrong types.
    
    > [...]
    >   File
    > ".../poky/scripts/lib/wic/filemap.py", line 545, in sparse_copy
    >     if start < skip < end:
    > TypeError: unorderable types: int() < str()
    
    (From OE-Core rev: 46b5814bcdc0e7e3cb293e877e2aa949baf5fef8)
    
    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/plugins/source/rawcopy.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
index 12348ae..bc71cf6 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -73,7 +73,7 @@ class RawCopyPlugin(SourcePlugin):
         dst = os.path.join(cr_workdir, "%s.%s" % (source_params['file'], part.lineno))
 
         if 'skip' in source_params:
-            sparse_copy(src, dst, skip=source_params['skip'])
+            sparse_copy(src, dst, skip=int(source_params['skip']))
         else:
             sparse_copy(src, dst)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]