[Git][NTPsec/ntpsec][master] Make ntpq version string match ntpd

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
402bf8d0 by Hal Murray at 2016-11-19T15:57:44-08:00
Make ntpq version string match ntpd

- - - - -


2 changed files:

- ntpq/ntpq
- pylib/util.py


Changes:

=====================================
ntpq/ntpq
=====================================
--- a/ntpq/ntpq
+++ b/ntpq/ntpq
@@ -1552,7 +1552,7 @@ if __name__ == '__main__':
         elif switch in ("-p", "--peers"):
             interpreter.ccmds.append("peers")
         elif switch in ("-V", "--version"):
-            print("ntpq %s\n" % version)
+            print("ntpq %s" % version)
             raise SystemExit(0)
         elif switch in ("-w", "--wide"):
             interpreter.wideremote = True


=====================================
pylib/util.py
=====================================
--- a/pylib/util.py
+++ b/pylib/util.py
@@ -13,7 +13,7 @@ from ntp.packet import *
 from ntp.version import *
 
 def stdversion():
-    return "%s %s+%s %s" % (BASENAME, VERSION, TICK, DATE)
+    return "%s-%s-%s %s" % (VERSION, TICK, BASENAME, DATE)
 
 def portsplit(hostname):
     portsuffix = ""



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/402bf8d0a00f5982e2c8c8eebdead8c95af5c8c3
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20161119/820651ec/attachment.html>