0440703030
- PE: Demote from Master does not clear previous errors - crmd: Prevent secondary DC fencing resulting from CIB updates that are lost due to elections - crmd: Log duplicate DC detection as a WARNING not ERROR - crmd: Bug lf#2632 - Correctly handle nodes that return faster than stonith - Core: Treat GNUTLS_E_UNEXPECTED_PACKET_LENGTH as normal termination of a TLS session - cib: Call gnutls_bye() and shutdown() when disconnecting from remote TLS connections - cib: Remove disconnected remote connections from mainloop - cib: Attempt a graceful sign-off for remote TLS connections - Core: Ensure there is sufficient space for EOS when building short-form option strings (prevents segfault) - Core: Fix variable expansion in pkg-config files - PE: Resolve memory leak reported by valgrind - PE: Fix memory leak for re-allocated resources reported by valgrind - PE: Improve the merging with template's operations - crmd: Allow nodes to fence themselves if they're the last one standing (lf#2584) - stonith: Add an API call for listing installed agents - stonith: Allow the fencing history to be queried - stonith: Ensure completed operations are recorded as such in the history - stonith: Support --quiet to display just the seconds since epoch at which a node was last shot - stonith: Serialize actions for a given device - stonith: Add missing entries to stonith_error2string() (missing OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=18
24 lines
899 B
Diff
24 lines
899 B
Diff
# HG changeset patch
|
|
# User Dejan Muhamedagic <dejan@hello-penguin.com>
|
|
# Date 1312838871 -7200
|
|
# Node ID a09974a06cdf6a3d73c3cdfa6e4d89d41e2ca9f0
|
|
# Parent 29fd4f04c01f92e54026d9d6bb54d617d8b1fdcd
|
|
Low: Shell: avoid DeprecationWarning for BaseException.message
|
|
|
|
diff --git a/shell/modules/utils.py b/shell/modules/utils.py
|
|
--- a/shell/modules/utils.py
|
|
+++ b/shell/modules/utils.py
|
|
@@ -257,9 +257,9 @@ def acquire_lock(dir):
|
|
os.mkdir(os.path.join(dir,_LOCKDIR))
|
|
str2file("%d" % os.getpid(),os.path.join(dir,_LOCKDIR,_PIDF))
|
|
return True
|
|
- except OSError, e:
|
|
- if e.errno != os.errno.EEXIST:
|
|
- common_err("%s" % e.message)
|
|
+ except OSError as (errno, strerror):
|
|
+ if errno != os.errno.EEXIST:
|
|
+ common_err(strerror)
|
|
return False
|
|
time.sleep(0.1)
|
|
continue
|