fence-agents: master - fencing: Validation if password/password_script or identity file is used was not processed

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=cda15e... Commit: cda15e4940779111aa69aa29da705ae91b789a83 Parent: a503b8a48236b63ba156d773aa60a41561c8f082 Author: Marek 'marx' Grac <mgrac(a)redhat.com&gt; AuthorDate: Fri May 24 16:17:12 2013 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com&gt; CommitterDate: Fri May 24 16:17:12 2013 +0200 fencing: Validation if password/password_script or identity file is used was not processed Resolves: rhbz#959490 --- fence/agents/lib/fencing.py.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index b14c329..b7ea3d9 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -675,9 +675,9 @@ def check_input(device_opt, opt): if 0 == device_opt.count("identity_file"): if 0 == (options.has_key("--password") or options.has_key("--password-script")): fail_usage("Failed: You have to enter password or password script") - else: - if 0 == (options.has_key("--password") or options.has_key("--password-script") or options.has_key("--identity-file")): - fail_usage("Failed: You have to enter password, password script or identity file") + else: + if 0 == (options.has_key("--password") or options.has_key("--password-script") or options.has_key("--identity-file")): + fail_usage("Failed: You have to enter password, password script or identity file") if 0 == options.has_key("--ssh") and 1 == options.has_key("--identity-file"): fail_usage("Failed: You have to use identity file together with ssh connection (-x)")