diff options
| author |   Maciej Borzecki <maciej.borzecki@rndity.com> | 2016-11-10 13:18:32 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-15 15:19:55 +0000 |
| commit | f0181e79eda9102e11ae1ec3e4939ac5fc02cb13 (patch) | |
| tree | f89783b7ca2f6120a84f1e2f138c858613511b29 /scripts/lib/wic/plugins | |
| parent | 81afedc905280f4bfc5fd5f2806a0c6baf657055 (diff) | |
| download | openembedded-core-contrib-f0181e79eda9102e11ae1ec3e4939ac5fc02cb13.tar.gz | |
wic: make sure that partition size is always an integer in internal processing
The size field of Partition class is expected to be an integer and ought
to be set inside prepare_*() method. Make sure that this is always the
case.
(From OE-Core rev: a37838f995ae642b0b8bdd47a605a264fb3bf200)
Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/plugins')
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/rawcopy.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 8bc362254d..4adb80becc 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -234,5 +234,5 @@ class BootimgEFIPlugin(SourcePlugin): out = exec_cmd(du_cmd) bootimg_size = out.split()[0] - part.size = bootimg_size + part.size = int(bootimg_size) part.source_file = bootimg diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index e0b11f95ad..5bd22fdeb5 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -78,9 +78,9 @@ class RawCopyPlugin(SourcePlugin): # get the size in the right units for kickstart (kB) du_cmd = "du -Lbks %s" % dst out = exec_cmd(du_cmd) - filesize = out.split()[0] + filesize = int(out.split()[0]) - if int(filesize) > int(part.size): + if filesize > part.size: part.size = filesize part.source_file = dst |