From 5fa7768bfb4b6d464c6a812822b0665f52e7bea4 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 31 Jan 2017 19:31:55 +0200 Subject: wic: code cleanup Fixed indentation, unused imports, trailing lines etc. [YOCTO #10619] Signed-off-by: Ed Bartosh --- scripts/lib/wic/utils/partitionedfs.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'scripts/lib/wic/utils/partitionedfs.py') diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py index eb4d7e6a51..5fc5765d65 100644 --- a/scripts/lib/wic/utils/partitionedfs.py +++ b/scripts/lib/wic/utils/partitionedfs.py @@ -21,7 +21,7 @@ import os from wic import msger from wic.utils.errors import ImageError -from wic.utils.misc import exec_cmd, exec_native_cmd +from wic.utils.misc import exec_native_cmd from wic.filemap import sparse_copy # Overhead of the MBR partitioning scheme (just one sector) @@ -350,10 +350,9 @@ class Image(): if self.disks: for dev in self.disks: disk = self.disks[dev] - try: + if hasattr(disk['disk'], 'cleanup'): disk['disk'].cleanup() - except: - pass + # remove partition images for image in self.partimages: if os.path.isfile(image): -- cgit v1.2.3