summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/utils/partitionedfs.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-31 19:31:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-02 17:37:36 +0000
commit5fa7768bfb4b6d464c6a812822b0665f52e7bea4 (patch)
tree3b8e004abd3a91f458856e0385d8379e8b129a48 /scripts/lib/wic/utils/partitionedfs.py
parent835f7a5c4c51f3d0d31d0193258b50596ceacb5a (diff)
downloadopenembedded-core-5fa7768bfb4b6d464c6a812822b0665f52e7bea4.tar.gz
wic: code cleanup
Fixed indentation, unused imports, trailing lines etc. [YOCTO #10619] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts/lib/wic/utils/partitionedfs.py')
-rw-r--r--scripts/lib/wic/utils/partitionedfs.py7
1 files changed, 3 insertions, 4 deletions
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):