STABLE2 - [FENCE] Fix #290231 - "Switch (optional)" param does not default to "1" and program fails

STABLE2 - [FENCE] Fix #290231 - "Switch (optional)" param does not default to "1" and program fails

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=897627c5e22ba9f78a22cd213d02acb1fa7b68f4
Commit:        897627c5e22ba9f78a22cd213d02acb1fa7b68f4
Parent:        fedd56b97fdc9b9bb2fa47958d14b9a324c4df3b
Author:        Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate:    Wed Sep 24 16:46:35 2008 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Sep 26 10:38:18 2008 +0200

[FENCE] Fix #290231 - "Switch (optional)" param does not default to "1" and program fails

    Bug itself was almost corrected in new fence agent but unfortunately '1' was
    entered as number not as string. Python can not do int + string and agent fails.
---
 fence/agents/apc/fence_apc.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index b8f0637..5d132be 100644
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -41,7 +41,7 @@ def get_power_status(conn, options):
 					fail_usage("Failed: You have to enter physical switch number")
 			else:
 				if (0 == options.has_key("-s")):
-					options["-s"] = 1
+					options["-s"] = "1"
 
 		if (None == re.compile('.*Outlet Management.*', re.IGNORECASE | re.S).match(conn.before)):
 			version = 2