fence-agents: master - fence_scsi: Short getopt for logfile differs in help/getopt

Marek GrĂ¡c marx at fedoraproject.org
Thu Nov 13 16:54:21 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=62d635a45478c0888a64983243cc0770c782aac3
Commit:        62d635a45478c0888a64983243cc0770c782aac3
Parent:        77ac33cc6d637f43a71c614a7488fd4c901a0487
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Thu Nov 13 16:49:19 2014 +0100
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Thu Nov 13 16:49:19 2014 +0100

fence_scsi: Short getopt for logfile differs in help/getopt

According to help text, user should use -a for setting logfile but
this option means 'APTL flag", this patch fixes it to -f as was accepted
also before.
---
 fence/agents/scsi/fence_scsi.py    |    2 +-
 tests/data/metadata/fence_scsi.xml |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fence/agents/scsi/fence_scsi.py b/fence/agents/scsi/fence_scsi.py
index ae960cc..72f9d90 100644
--- a/fence/agents/scsi/fence_scsi.py
+++ b/fence/agents/scsi/fence_scsi.py
@@ -292,7 +292,7 @@ be removed from the device(s).",
 	all_opt["logfile"] = {
 		"getopt" : "f:",
 		"longopt" : "logfile",
-		"help" : "-a, --logfile                  Log output (stdout and stderr) to file",
+		"help" : "-f, --logfile                  Log output (stdout and stderr) to file",
 		"required" : "0",
 		"shortdesc" : "Log output (stdout and stderr) to file",
 		"order": 5
diff --git a/tests/data/metadata/fence_scsi.xml b/tests/data/metadata/fence_scsi.xml
index 590f4aa..738dd00 100644
--- a/tests/data/metadata/fence_scsi.xml
+++ b/tests/data/metadata/fence_scsi.xml
@@ -30,7 +30,7 @@ The fence_scsi agent works by having each node in the cluster register a unique
 		<shortdesc lang="en">Name of the node to be fenced. The node name is used to generate the key value used for the current operation. This option will be ignored when used with the -k option.</shortdesc>
 	</parameter>
 	<parameter name="logfile" unique="0" required="0">
-		<getopt mixed="-a, --logfile" />
+		<getopt mixed="-f, --logfile" />
 		<content type="string"  />
 		<shortdesc lang="en">Log output (stdout and stderr) to file</shortdesc>
 	</parameter>


More information about the cluster-commits mailing list