Fw: [Git][NTPsec/ntpsec][master] Retire ntpq's -O option. It's unclear how to do it right.
Gary E. Miller
gem at rellim.com
Tue Nov 8 17:33:35 UTC 2016
Yo Eric!
Just look at the old ntpq:
dagwood ~ # ntpq -O -c "rv 0 frequency" spidey
associd=0 status=0418 leap_none, sync_uhf_radio, 1 event, no_sys_peer,
frequency=-0.611
dagwood ~ # ntpq -c "rv 0 frequency" spidey
frequency=-0.588
dagwood ~ #
RGDS
GARY
---------------------------------------------------------------------------
Gary E. Miller Rellim 109 NW Wilmington Ave., Suite E, Bend, OR 97703
gem at rellim.com Tel:+1 541 382 8588
Begin forwarded message:
Date: Tue, 08 Nov 2016 13:20:47 +0000
From: "Eric S. Raymond" <gitlab at mg.gitlab.com>
To: vc at ntpsec.org
Subject: [Git][NTPsec/ntpsec][master] Retire ntpq's -O option. It's
unclear how to do it right.
Eric S. Raymond pushed to branch master at NTPsec / ntpsec
Commits:
80a24b8c by Eric S. Raymond at 2016-11-08T08:19:51-05:00
Retire ntpq's -O option. It's unclear how to do it right.
- - - - -
2 changed files:
- docs/includes/ntpq-body.txt
- ntpq/ntpq
Changes:
=====================================
docs/includes/ntpq-body.txt
=====================================
--- a/docs/includes/ntpq-body.txt
+++ b/docs/includes/ntpq-body.txt
@@ -74,9 +74,6 @@ attempt to read interactive format commands from the
standard input. +-n+, +--numeric+::
Output all host addresses in numeric format rather than
converting to the canonical host names.
-+-O+, +--old-rv+::
- Print an extra line when reading a single value with rv,
- for example +ntpq -O -c "rv 0 frequency"+
+-p+, +--peers+::
Print a list of the peers known to the server as well as a summary of
their state. This is equivalent to the +peers+ interactive command.
@@ -563,4 +560,6 @@ In older versions, the 'type' variable associated
with a reference clock was a numeric driver type index. It has been
replaced by 'name', a shortname for the driver type.
+The -O (--old-rv) option of legacy versions has been retired.
+
// end
=====================================
ntpq/ntpq
=====================================
--- a/ntpq/ntpq
+++ b/ntpq/ntpq
@@ -140,7 +140,6 @@ class Ntpq(cmd.Cmd):
self.session = session
self.prompt = "ntpq> "
self.interactive = False # set to True when we
should prompt
- self.old_rv = False # use old readvars
behavior? #self.auth_keyid = 0 # Keyid used for
authentication. #self.auth_keytype = "NID_md5" # MD5 (FIXME:
string value is a dummy) #self.auth_hashlen = 16 # MD5
@@ -444,12 +443,6 @@ usage: help [ command ]
def __dolist(self, varlist, associd, op, type):
"List variables associated with a specified peer."
- # if we're asking for specific variables don't include the
- # status header line in the output.
- if self.old_rv:
- quiet = False
- else:
- quiet = not (not varlist) # nonempty?
try:
variables = self.session.readvar(associd, varlist, op)
except Mode6Exception as e:
@@ -471,7 +464,7 @@ usage: help [ command ]
return True
if not quiet:
self.say("associd=%d " % associd)
- self.printvars(variables, type, quiet)
+ self.printvars(variables, type, not (not varlist))
return True
# Unexposed helper tables and functions end here
@@ -1490,7 +1483,6 @@ USAGE: ntpq [-46dphinOV] [-c str] [-D lvl]
[ host ...] command
peers
-n no numeric numeric host addresses
- -O no old-rv Always output status line with readvar
-V opt version Output version information and exit
-w no wide enable wide display of addresses
'''
@@ -1501,11 +1493,11 @@ if __name__ == '__main__':
try:
(options, arguments) = getopt.getopt(sys.argv[1:],
- "46c:dD:hinOpVw",
+ "46c:dD:hinpVw",
["ipv4","ipv6", "command",
"debug",
"set-debug-level", "help", "interactive", "numeric",
- "old-rv", "peers",
"version",
+ "peers", "version",
"wide"])
except getopt.GetoptError as e:
print(e)
@@ -1534,8 +1526,6 @@ if __name__ == '__main__':
interpreter.interactive = True
elif switch in ("-n", "--numeric"):
interpreter.showhostnames = False
- elif switch in ("-O", "--old-rv"):
- interpreter.old_rv = True
elif switch in ("-p", "--peers"):
interpreter.ccmds.append("peers")
elif switch in ("-V", "--version"):
View it on GitLab:
https://gitlab.com/NTPsec/ntpsec/commit/80a24b8cbe20fd465a97b0916136905fcec0e436
RGDS
GARY
---------------------------------------------------------------------------
Gary E. Miller Rellim 109 NW Wilmington Ave., Suite E, Bend, OR 97703
gem at rellim.com Tel:+1 541 382 8588
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/devel/attachments/20161108/7ba69950/attachment.html>
-------------- next part --------------
_______________________________________________
vc mailing list
vc at ntpsec.org
http://lists.ntpsec.org/mailman/listinfo/vc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 455 bytes
Desc: OpenPGP digital signature
URL: <http://lists.ntpsec.org/pipermail/devel/attachments/20161108/7ba69950/attachment.bin>
More information about the devel
mailing list