Hello Douglas Schilling Landgraf, Federico Simoncelli, Vinzenz Feenstra, Eduardo,
I'd like you to do a code review. Please visit http://gerrit.ovirt.org/15353 to review the following change. Change subject: Support teardownVolumePath(None) ...................................................................... Support teardownVolumePath(None) Change-Id: I68bc4996ec1789e090111e8aeadaf733e163543b Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=962549 Signed-off-by: Eduardo <ewars...@redhat.com> Reviewed-on: http://gerrit.ovirt.org/15316 Reviewed-by: Federico Simoncelli <fsimo...@redhat.com> Reviewed-by: Douglas Schilling Landgraf <dougsl...@redhat.com> Reviewed-by: Vinzenz Feenstra <vfeen...@redhat.com> Reviewed-by: Dan Kenigsberg <dan...@redhat.com> Tested-by: Dan Kenigsberg <dan...@redhat.com> --- M vdsm/clientIF.py 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/15353/1 diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index fabd494..fec7d39 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -321,13 +321,11 @@ try: res = self.irs.teardownImage(drive['domainID'], drive['poolID'], drive['imageID']) - except KeyError: - self.log.warning("Drive is not a vdsm image: %s", - drive, exc_info=True) - except TypeError: - if not isinstance(drive, basestring): - raise + except (KeyError, TypeError): # paths (strings) are not deactivated + if not isinstance(drive, basestring): + self.log.warning("Drive is not a vdsm image: %s", + drive, exc_info=True) return res['status']['code'] -- To view, visit http://gerrit.ovirt.org/15353 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68bc4996ec1789e090111e8aeadaf733e163543b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.2 Gerrit-Owner: Dan Kenigsberg <dan...@redhat.com> Gerrit-Reviewer: Douglas Schilling Landgraf <dougsl...@redhat.com> Gerrit-Reviewer: Eduardo <ewars...@redhat.com> Gerrit-Reviewer: Federico Simoncelli <fsimo...@redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeen...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches