[Git][NTPsec/ntpsec][master] 3 commits: Typo

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
cb659e3e by Matt Selsky at 2016-10-29T13:52:55-04:00
Typo

- - - - -
15437bdf by Matt Selsky at 2016-10-29T13:52:55-04:00
Clean up error messages for pyntpq commands without arguments

- - - - -
11ff9619 by Matt Selsky at 2016-10-29T14:08:13-04:00
usage message should go to stderr, not stdout

- - - - -


2 changed files:

- docs/includes/mon-commands.txt
- ntpq/pyntpq


Changes:

=====================================
docs/includes/mon-commands.txt
=====================================
--- a/docs/includes/mon-commands.txt
+++ b/docs/includes/mon-commands.txt
@@ -22,7 +22,7 @@ clock in decoded ASCII format, where meaningful. In some clock drivers
 a good deal of additional information can be gathered and displayed as
 well. See information specific to each clock for further details.
 
-  +cdcryptostats+;;
+  +cryptostats+;;
     This option requires the OpenSSL cryptographic software library. It
     enables recording of cryptographic public key protocol information.
     Each message received by the protocol module appends a line of the


=====================================
ntpq/pyntpq
=====================================
--- a/ntpq/pyntpq
+++ b/ntpq/pyntpq
@@ -531,7 +531,7 @@ usage: timeout [ msec ]
     def do_delay(self, line):
         "set the delay added to encryption time stamps"
         if not line:
-            self.say("delay %dms" % self.auth_delay)
+            self.say("delay %d ms\n" % self.auth_delay)
         else:
             try:
                 self.auth_delay = int(line)
@@ -807,7 +807,7 @@ usage: lpassociations
     def do_addvars(self, line):
         "add variables to the variable list or change their values"
         if line == "":
-            print("usage addvars name[=value][,...]")
+            self.warn("usage: addvars name[=value][,...]")
             return
         vars_to_add = line.split(',')
         for add_var in vars_to_add:
@@ -826,7 +826,7 @@ usage: addvars name[=value][,...]
     def do_rmvars(self, line):
         "remove variables from the variable list"
         if line == "":
-            print("usage rmvars name[,...]")
+            self.warn("usage: rmvars name[,...]")
             return
         vars_to_rm = line.split(',')
         for rm_var in vars_to_rm:
@@ -933,6 +933,9 @@ usage: writevar assocID name=value,[...]
 
     def do_mreadlist(self, line):
         "read the peer variables in the variable list for multiple peers"
+        if not line:
+                self.warn("usage: mreadlist assocIDlow assocIDhigh\n")
+                return
         idrange = self.__assoc_range_valid()
         if not idrange:
             return
@@ -952,6 +955,9 @@ usage: mreadlist assocIDlow assocIDhigh
 
     def do_mrl(self, line):
         "read the peer variables in the variable list for multiple peers"
+        if not line:
+                self.warn("usage: mrl assocIDlow assocIDhigh\n")
+                return
         self.do_mreadlist(line)
 
     def help_mrl(self):
@@ -962,6 +968,9 @@ usage: mrl assocIDlow assocIDhigh
 
     def do_mreadvar(self, line):
         "read peer variables from multiple peers"
+        if not line:
+                self.warn("usage: mreadvar assocIDlow assocIDhigh [ name=value[,...] ]\n")
+                return
         idrange = self.__assoc_range_valid()
         if not idrange:
             return
@@ -980,6 +989,9 @@ usage: mreadvar assocIDlow assocIDhigh [ name=value[,...] ]
 
     def do_mrv(self, line):
         "read peer variables from multiple peers"
+        if not line:
+                self.warn("usage: mrv assocIDlow assocIDhigh [ name=value[,...] ]\n")
+                return
         self.do_mreadvar(line)
 
     def help_mrv(self):



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/33deab942c3f74d32d5fd629e1b46145060000d5...11ff9619aa0ba294056400fbbff1019bfe83fc2a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20161029/61d50190/attachment.html>