|
 |
83b9f8f |
From 5982cb826a56ee322c7e5d6fbee479ff5b996561 Mon Sep 17 00:00:00 2001
|
|
|
83b9f8f |
From: Dan Kenigsberg <danken@redhat.com>
|
|
|
83b9f8f |
Date: Sat, 23 Jun 2012 18:46:51 +0300
|
|
|
83b9f8f |
Subject: [PATCH 19/19] BZ#824298 fix typo in keyword argument exc_info
|
|
|
83b9f8f |
|
|
|
83b9f8f |
Change-Id: Iff2ba114298bc1223ae4969f5da0eb5a5ce8672e
|
|
|
83b9f8f |
Signed-off-by: Dan Kenigsberg <danken@redhat.com>
|
|
|
83b9f8f |
Reviewed-on: http://gerrit.ovirt.org/5617
|
|
|
83b9f8f |
Reviewed-by: Igor Lvovsky <ilvovsky@redhat.com>
|
|
|
83b9f8f |
Reviewed-on: http://gerrit.ovirt.org/5628
|
|
|
83b9f8f |
---
|
|
|
83b9f8f |
vdsm/configNetwork.py | 4 ++--
|
|
|
83b9f8f |
vdsm/storage/image.py | 4 ++--
|
|
|
83b9f8f |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
83b9f8f |
|
|
|
83b9f8f |
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
|
|
|
83b9f8f |
index 8b831d6..c535499 100755
|
|
|
83b9f8f |
--- a/vdsm/configNetwork.py
|
|
|
83b9f8f |
+++ b/vdsm/configNetwork.py
|
|
|
83b9f8f |
@@ -1,4 +1,4 @@
|
|
|
83b9f8f |
-# Copyright 2011 Red Hat, Inc.
|
|
|
83b9f8f |
+# Copyright 2011-2012 Red Hat, Inc.
|
|
|
83b9f8f |
#
|
|
|
83b9f8f |
# This program is free software; you can redistribute it and/or modify
|
|
|
83b9f8f |
# it under the terms of the GNU General Public License as published by
|
|
|
83b9f8f |
@@ -673,7 +673,7 @@ def removeLibvirtNetwork(network, log=True):
|
|
|
83b9f8f |
except libvirt.libvirtError:
|
|
|
83b9f8f |
if log:
|
|
|
83b9f8f |
logging.debug('failed to remove libvirt network %s', netName,
|
|
|
83b9f8f |
- exec_info=True)
|
|
|
83b9f8f |
+ exc_info=True)
|
|
|
83b9f8f |
|
|
|
83b9f8f |
def assertBridgeClean(bridge, vlan, bonding, nics):
|
|
|
83b9f8f |
brifs = os.listdir('/sys/class/net/%s/brif/' % bridge)
|
|
|
83b9f8f |
diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py
|
|
|
83b9f8f |
index 03c94dc..a868568 100644
|
|
|
83b9f8f |
--- a/vdsm/storage/image.py
|
|
|
83b9f8f |
+++ b/vdsm/storage/image.py
|
|
|
83b9f8f |
@@ -1,5 +1,5 @@
|
|
|
83b9f8f |
#
|
|
|
83b9f8f |
-# Copyright 2009-2011 Red Hat, Inc.
|
|
|
83b9f8f |
+# Copyright 2009-2012 Red Hat, Inc.
|
|
|
83b9f8f |
#
|
|
|
83b9f8f |
# This program is free software; you can redistribute it and/or modify
|
|
|
83b9f8f |
# it under the terms of the GNU General Public License as published by
|
|
|
83b9f8f |
@@ -676,7 +676,7 @@ class Image:
|
|
|
83b9f8f |
raise
|
|
|
83b9f8f |
except Exception, e:
|
|
|
83b9f8f |
self.__cleanupMultimove(sdUUID=dstSdUUID, imgList=cleanup_candidates, postZero=postZero)
|
|
|
83b9f8f |
- self.log.error(e, exec_info=True)
|
|
|
83b9f8f |
+ self.log.error(e, exc_info=True)
|
|
|
83b9f8f |
raise se.CopyImageError("image=%s, src domain=%s, dst domain=%s: msg %s" % (imgUUID, srcSdUUID, dstSdUUID, str(e)))
|
|
|
83b9f8f |
|
|
|
83b9f8f |
cleanup_candidates.append(imgUUID)
|
|
|
83b9f8f |
--
|
|
|
83b9f8f |
1.7.10.2
|
|
|
83b9f8f |
|