Laszlo Hornyak has uploaded a new change for review. Change subject: pep8 fixes ......................................................................
pep8 fixes fixes in the code to make vdsm build on rhel 6.3 Change-Id: Ifbbba925fa0c9be78b0eb5eb3d07066dc3b3c5ab Signed-off-by: Laszlo Hornyak <[email protected]> --- M vdsm/storage/misc.py M vdsm/vm.py 2 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/9366/1 diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 6360dcf..9f3d1bc 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -733,12 +733,10 @@ # keep the earliest exception info if not firstException: firstException = e - # keep the original traceback info - traceback = sys.exc_info()[2] # re-raise the earliest exception if firstException is not None: - raise firstException, None, traceback + raise firstException def defer(self, func, *args, **kwargs): self._finally.append((func, args, kwargs)) diff --git a/vdsm/vm.py b/vdsm/vm.py index e6d5947..73e3f3f 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -363,7 +363,7 @@ SOUND_DEVICES: [], VIDEO_DEVICES: [], CONTROLLER_DEVICES: [], GENERAL_DEVICES: [], BALLOON_DEVICES: [], REDIR_DEVICES: [], - WATCHDOG_DEVICES: [],} + WATCHDOG_DEVICES: []} def _get_lastStatus(self): PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up') @@ -495,7 +495,8 @@ if not 'specParams' in devices[WATCHDOG_DEVICES][0]: devices[WATCHDOG_DEVICES][0]['specParams'] = {} if not 'model' in devices[WATCHDOG_DEVICES][0]['specParams']: - devices[WATCHDOG_DEVICES][0]['specParams']['model'] = 'i6300esb' + devices[WATCHDOG_DEVICES][0]['specParams']['model'] = \ + 'i6300esb' if not 'action' in devices[WATCHDOG_DEVICES][0]['specParams']: devices[WATCHDOG_DEVICES][0]['specParams']['action'] = 'none' -- To view, visit http://gerrit.ovirt.org/9366 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifbbba925fa0c9be78b0eb5eb3d07066dc3b3c5ab Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
