From 4e4213f1aabfbb0a09f66cabd16079dc6e71e042 Mon Sep 17 00:00:00 2001

From: Marek 'marx' Grac <mgrac@redhat.com>

Date: Tue, 11 Aug 2015 09:29:08 +0200

Subject: [PATCH] fencing: Move checking of --plug and --port-as-ip to run them

 only on getopt

Fix wrong backporting of patch 4442f2548543f418fc8e094c701fa27edf8e6bfa

---

 fence/agents/lib/fencing.py.py | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py

index bb8e3a4..9a16aee 100644

--- a/fence/agents/lib/fencing.py.py

+++ b/fence/agents/lib/fencing.py.py

@@ -659,7 +659,7 @@ def process_input(avail_opt):

 		#####

 		# This test should NOT be used for stdin input where it should be allowed (and ignored)

-		if "port_as_ip" in device_opt and not "--port-as-ip" in options and "--plug" in options:

+		if "port_as_ip" in avail_opt and not "--port-as-ip" in opt and "--plug" in opt:

 			fail_usage("Parser error: option -n/--plug is not recognized")

 	else:

 		opt = {}

-- 

1.9.3