cluster: RHEL510 - fencing: fix error introduced by be4ffa1bed23328a36b182b69c1c355abb7e16af

Marek GrĂ¡c marx at fedoraproject.org
Mon Jun 17 16:04:07 UTC 2013


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=6d807b2d391332fbe401735603d6193a65a7aa3f
Commit:        6d807b2d391332fbe401735603d6193a65a7aa3f
Parent:        be593c8577d5c405facb5a454f5d934c3f9fb23b
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Mon Jun 17 18:01:00 2013 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Mon Jun 17 18:01:00 2013 +0200

fencing: fix error introduced by be4ffa1bed23328a36b182b69c1c355abb7e16af

Problem occurs when cmd line is not a list but a single variable. This patch
makes list from non-lists and solves this problem. Problem do not occur in 4.x versions
as there all cmd-lines can be only lists.

Resolves: rhbz#886612
---
 fence/agents/lib/fencing.py.py |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index d1e43da..80f727b 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -959,6 +959,9 @@ def fence_login(options):
 			try:
 				conn.send_eol(options["-p"])
 
+				if type(options["-c"]) is not list:
+					options["-c"] = [ options["-c"] ]
+                                                                        
 				valid_password = conn.log_expect(options, [ re_login_string ] + options["-c"], int(options["-Y"]))
 				if valid_password == 0:
 					## password is invalid or we have to change EOL separator


More information about the cluster-commits mailing list