sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Check return of _load_state" into feature/v2

Browse Source
This commit is contained in:
Jenkins 2017-02-06 23:41:50 +00:00 committed by Gerrit Code Review
commit 0f224d3ae6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage_builder/block_device/blockdevice.py
View File

@ -188,6 +188,8 @@ class BlockDevice(object):
"""Cleanup all remaining relicts - in good case""" """Cleanup all remaining relicts - in good case"""
dg, reverse_order, state = self._load_state() dg, reverse_order, state = self._load_state()
if dg is None:
return 0
for node in reverse_order: for node in reverse_order:
node.cleanup(state) node.cleanup(state)
@ -200,6 +202,8 @@ class BlockDevice(object):
"""Cleanup all remaining relicts - in case of an error""" """Cleanup all remaining relicts - in case of an error"""
dg, reverse_order, state = self._load_state() dg, reverse_order, state = self._load_state()
if dg is None:
return 0
for node in reverse_order: for node in reverse_order:
node.delete(state) node.delete(state)