fetchmailconf -h documents the fetchmailconf -h option.

fetchmailconf -V now prints the fetchmailconf version.

svn path=/trunk/; revision=4365

2 files changed, 10 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index 8903fddb..e0c94f81 100644
--- a/NEWS
+++ b/NEWS
@@ -236,6 +236,8 @@ fetchmail 6.3.0 (not yet released officially):
   Miśkiewicz. (MA)
 * Global variable cleanup, to fix daemon mode reinitialization problems. Patch
   by Sunil Shetye. (MA)
+* fetchmailconf -h documents the fetchmailconf -h option. Matthias Andree
+* fetchmailconf -V now prints the fetchmailconf version. Matthias Andree
 
 # INTERNAL CHANGES
 * Switched to automake. Matthias Andree.
diff --git a/fetchmailconf.py b/fetchmailconf.py
index 571e18fb..5844d01c 100755
--- a/fetchmailconf.py
+++ b/fetchmailconf.py
@@ -5,7 +5,7 @@
 # Matthias Andree <matthias.andree@gmx.de>
 # Requires Python with Tkinter, and the following OS-dependent services:
 #	posix, posixpath, socket
-version = "1.49"
+version = "1.50"
 
 from Tkinter import *
 from Dialog import *
@@ -2038,7 +2038,7 @@ gUSiYASJpMEHhilJTEnhAlGoQqYAZQ1AiqEMZ0jDGtqQImhwwA13yMMevoQAGvGhEAWHGMOAAAA7
 #
 
     # Process options
-    (options, arguments) = getopt.getopt(sys.argv[1:], "df:h")
+    (options, arguments) = getopt.getopt(sys.argv[1:], "df:hV")
     dump = rcfile = None;
     for (switch, val) in options:
 	if (switch == '-d'):
@@ -2047,11 +2047,16 @@ gUSiYASJpMEHhilJTEnhAlGoQqYAZQ1AiqEMZ0jDGtqQImhwwA13yMMevoQAGvGhEAWHGMOAAAA7
 	    rcfile = val
 	elif (switch == '-h'):
 	    print """
-Usage: fetchmailconf [-d] [-f fetchmailrc]
+Usage: fetchmailconf {[-d] [-f fetchmailrc]|-h|-V}
 -d       - dump configuration (for debugging)
 -f fmrc  - read alternate fetchmailrc file
+-h       - print this help text and quit
+-V       - print fetchmailconf version and quit
 """
 	    sys.exit(0)
+	elif (switch == '-V'):
+	    print "fetchmailconf %s" % version
+	    sys.exit(0)
 
     # Get client host's FQDN
     hostname = socket.gethostbyaddr(socket.gethostname())[0]