From: Ross Burton <ross.burton@intel.com>
Date: Fri, 7 Jun 2019 11:05:02 +0000 (+0100)
Subject: wic/filemap: handle FIGETBSZ failing
X-Git-Tag: uninative-2.6~137
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3757073726a00c5250556aae3d0daac76b88085e;p=openembedded-core.git

wic/filemap: handle FIGETBSZ failing

Some file systems don't support fetching the block size (notably the file system
Docker uses for containers), so handle the iotctl() failing and raise the
expected error.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py
index 244c07a71c..a3919fbcad 100644
--- a/scripts/lib/wic/filemap.py
+++ b/scripts/lib/wic/filemap.py
@@ -32,7 +32,10 @@ def get_block_size(file_obj):
     """
     # Get the block size of the host file-system for the image file by calling
     # the FIGETBSZ ioctl (number 2).
-    binary_data = fcntl.ioctl(file_obj, 2, struct.pack('I', 0))
+    try:
+        binary_data = fcntl.ioctl(file_obj, 2, struct.pack('I', 0))
+    except OSError:
+        raise IOError("Unable to determine block size")
     bsize = struct.unpack('I', binary_data)[0]
     if not bsize:
         import os