[oe-commits] [openembedded-core] 10/26: wic: plugins: rawcopy: Fixed wrong variable type

git at git.openembedded.org git at git.openembedded.org
Thu Mar 9 01:23:15 UTC 2017


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

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

commit 304644fd95d7ca018f7999b1a7996e7e0bf2dd58
Author: Daniel Schultz <d.schultz at phytec.de>
AuthorDate: 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()
    
    Signed-off-by: Daniel Schultz <d.schultz at phytec.de>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/wic/plugins/source/rawcopy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
 

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


More information about the Openembedded-commits mailing list