From: Daniel Schultz <d.schultz@phytec.de>
Date: Tue, 7 Mar 2017 13:41:55 +0000 (+0100)
Subject: wic: plugins: rawcopy: Fixed wrong variable type
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~22158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46b5814bcdc0e7e3cb293e877e2aa949baf5fef8;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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@phytec.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
index 12348ae35e2..bc71cf6f763 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)