Re: [PATCH 2/5] wic: use partition size when creating empty partition files

[Ed Bartosh <ed.bartosh@linux.intel.com>]

On Tue, Nov 08, 2016 at 04:56:08PM +0100, Maciej Borzecki wrote:
> It seems that prepare_empty_partition_ext() and
> prepare_empty_partition_btrfs() got broken in commit
> c8669749e37fe865c197c98d5671d9de176ff4dd, thus one could observe the
> following backtrace:
> 
> Backtrace:
>   File "<snip>/poky/scripts/lib/wic/plugins/imager/direct_plugin.py", line 93, in do_create
>     creator.create()
>   File "<snip>/poky/scripts/lib/wic/imager/baseimager.py", line 159, in create
>     self._create()
>   File "<snip>/poky/scripts/lib/wic/imager/direct.py", line 290, in _create
>     self.bootimg_dir, self.kernel_dir, self.native_sysroot)
>   File "<snip>/poky/scripts/lib/wic/partition.py", line 146, in prepare
>     method(rootfs, oe_builddir, native_sysroot)
>   File "<snip>/poky/scripts/lib/wic/partition.py", line 325, in prepare_empty_partition_ext
>     os.ftruncate(sparse.fileno(), rootfs_size * 1024)
> NameError: name 'rootfs_size' is not defined
> 
> Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
> ---
>  scripts/lib/wic/partition.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
> index 4b8d769437120adadb5dba2f3919d4eb96141292..8adc698240c8e3bd9f4118663a5d7a167e0bb4a4 100644
> --- a/scripts/lib/wic/partition.py
> +++ b/scripts/lib/wic/partition.py
> @@ -308,7 +308,7 @@ class Partition():
>          Prepare an empty ext2/3/4 partition.
>          """
>          with open(rootfs, 'w') as sparse:
> -            os.ftruncate(sparse.fileno(), rootfs_size * 1024)
> +            os.ftruncate(sparse.fileno(), self.size * 1024)
>  
>          extra_imagecmd = "-i 8192"
>  
> @@ -326,7 +326,7 @@ class Partition():
>          Prepare an empty btrfs partition.
>          """
>          with open(rootfs, 'w') as sparse:
> -            os.ftruncate(sparse.fileno(), rootfs_size * 1024)
> +            os.ftruncate(sparse.fileno(), self.size * 1024)
>  
>          label_str = ""
>          if self.label:

Thank you for the fix. Sorry for breaking this. I thought I
double-checked and all tests were passing :(


--
Regards,
Ed