fence-agents: master - fencing: Do not check IP address if fence agent does not need any.

[Marek Grác]

Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=9e797a89b...
Commit:        9e797a89be42e637958ec750e6776441c9557175
Parent:        0e7521cba9e9cd4e194153068013ccf01e484c9a
Author:        Marek 'marx' Grac 
AuthorDate:    Fri Nov 23 15:38:53 2012 +0100
Committer:     Marek 'marx' Grac 
CommitterDate: Sun Nov 25 13:15:25 2012 +0100

fencing: Do not check IP address if fence agent does not need any.

---
 fence/agents/lib/fencing.py.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index a334be7..6a5fd0b 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python

-import sys, getopt, time, os, uuid
+import sys, getopt, time, os, uuid, pycurl
 import pexpect, re, atexit
 import __main__

@@ -702,7 +702,7 @@ def check_input(device_opt, opt):
    if (0 == options.has_key("--username")) and device_opt.count("login") and (device_opt.count("no_login") == 0):
    	fail_usage("Failed: You have to set login name")

-	if 0 == options.has_key("--ip") and 0 == options.has_key("--managed"):
+	if device_opt.count("ipaddr") and 0 == options.has_key("--ip") and 0 == options.has_key("--managed"):
    	fail_usage("Failed: You have to enter fence address")

if (device_opt.count("no_password") == 0):