[oe-commits] [openembedded-core] 09/48: wic: plugins: rawcopy: Fixed wrong variable type
git at git.openembedded.org
git at git.openembedded.org
Thu May 18 12:08:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch morty
in repository openembedded-core.
commit 5b9bcfef9086c19a4577d36729b7b339f959d5c4
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>
(cherry picked from commit 46b5814bcdc0e7e3cb293e877e2aa949baf5fef8)
Signed-off-by: Armin Kuster <akuster808 at gmail.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 5bd22fd..618dd44 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -71,7 +71,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