Gitweb:
http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=b972ec...
Commit: b972ec00ea7e50664aa684efa7a2873d98a11c48
Parent: 917ed4bc76235d50ce36393817e6119e9065b2ef
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Thu Jun 26 14:22:29 2014 +0200
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Thu Jun 26 14:22:29 2014 +0200
fence_ilo: Fix issue with "
Previous patch was not backported correctly, there were additional quotes
Resolves: rhbz#990537
---
fence/agents/ilo/fence_ilo.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py
index 2541729..a50cdee 100644
--- a/fence/agents/ilo/fence_ilo.py
+++ b/fence/agents/ilo/fence_ilo.py
@@ -23,8 +23,8 @@ BUILD_DATE="March, 2008"
#END_VERSION_GENERATION
def get_power_status(conn, options):
- conn.send("<LOGIN USER_LOGIN = \"" +
quoteattr(options["-l"]) + "\"" + \
- " PASSWORD = \"" + quoteattr(options["-p"]) +
"\">\r\n")
+ conn.send("<LOGIN USER_LOGIN = " + quoteattr(options["-l"]) + \
+ " PASSWORD = " + quoteattr(options["-p"]) + ">\r\n")
conn.send("<SERVER_INFO MODE =
\"read\"><GET_HOST_POWER_STATUS/>\r\n")
conn.send("</SERVER_INFO></LOGIN>\r\n")
try:
@@ -38,8 +38,8 @@ def get_power_status(conn, options):
return status.lower().strip()
def set_power_status(conn, options):
- conn.send("<LOGIN USER_LOGIN = \"" +
quoteattr(options["-l"]) + "\"" + \
- " PASSWORD = \"" + quoteattr(options["-p"]) +
"\">\r\n")
+ conn.send("<LOGIN USER_LOGIN = " + quoteattr(options["-l"]) + \
+ " PASSWORD = " + quoteattr(options["-p"]) + ">\r\n")
conn.send("<SERVER_INFO MODE = \"write\">")
if options.has_key("fw_processor") and options["fw_processor"] ==
"iLO2":
@@ -102,8 +102,8 @@ the iLO card through an XML stream."
else:
conn.send("<RIBCL VERSION=\"1.2\">\r\n")
- conn.send("<LOGIN USER_LOGIN = \"" +
quoteattr(options["-l"]) + "\"" + \
- " PASSWORD = \"" + quoteattr(options["-p"]) +
"\">\r\n")
+ conn.send("<LOGIN USER_LOGIN = " + quoteattr(options["-l"]) + \
+ " PASSWORD = " + quoteattr(options["-p"]) + ">\r\n")
if options["-r"] >= 2:
conn.send("<RIB_INFO MODE=\"read\"><GET_FW_VERSION
/>\r\n")
conn.send("</RIB_INFO>\r\n")