summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Schultz <d.schultz@phytec.de>2017-03-07 14:41:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-18 13:07:32 +0100
commitb5fe7ef2ed936a53ed8fed95238775170a8ae7f3 (patch)
tree5662a2c6da2511de76cb8dd8343423d89ca75194 /scripts
parent561ff936f1d8ba50b728d14636f41f5a13e525e7 (diff)
downloadpoky-b5fe7ef2ed936a53ed8fed95238775170a8ae7f3.tar.gz
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: 5b9bcfef9086c19a4577d36729b7b339f959d5c4) Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 46b5814bcdc0e7e3cb293e877e2aa949baf5fef8) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/plugins/source/rawcopy.py2
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 5bd22fdeb5..618dd4475c 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -71,7 +71,7 @@ class RawCopyPlugin(SourcePlugin):
71 dst = os.path.join(cr_workdir, "%s.%s" % (source_params['file'], part.lineno)) 71 dst = os.path.join(cr_workdir, "%s.%s" % (source_params['file'], part.lineno))
72 72
73 if 'skip' in source_params: 73 if 'skip' in source_params:
74 sparse_copy(src, dst, skip=source_params['skip']) 74 sparse_copy(src, dst, skip=int(source_params['skip']))
75 else: 75 else:
76 sparse_copy(src, dst) 76 sparse_copy(src, dst)
77 77