[Git][NTPsec/ntpsec][master] Move standard version check code from 8 Python clients to util library.

[Matt Selsky (@selsky)]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
2dfe4949 by James Browning at 2023-02-08T14:34:20+00:00
Move standard version check code from 8 Python clients to util library.


- - - - -


9 changed files:

- ntpclients/ntpdig.py
- ntpclients/ntpmon.py
- ntpclients/ntpq.py
- ntpclients/ntpsnmpd.py
- ntpclients/ntpsweep.py
- ntpclients/ntptrace.py
- ntpclients/ntpviz.py
- ntpclients/ntpwait.py
- pylib/util.py


Changes:

=====================================
ntpclients/ntpdig.py
=====================================
@@ -263,10 +263,7 @@ USAGE:  ntpdig [-<flag> [<val>] | --<name>[{=| }<val>]]...
 
 if __name__ == '__main__':
     bin_ver = "ntpsec- at NTPSEC_VERSION_EXTENDED@"
-    if ntp.util.stdversion() != bin_ver:
-        sys.stderr.write("Module/Binary version mismatch\n")
-        sys.stderr.write("Binary: %s\n" % bin_ver)
-        sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
+    ntp.util.stdversioncheck(bin_ver)
     try:
         try:
             (options, arguments) = getopt.getopt(


=====================================
ntpclients/ntpmon.py
=====================================
@@ -212,10 +212,7 @@ USAGE: ntpmon [-dhnuV] [-D lvl] [-l logfile] [host]
 
 if __name__ == '__main__':
     bin_ver = "ntpsec- at NTPSEC_VERSION_EXTENDED@"
-    if ntp.util.stdversion() != bin_ver:
-        sys.stderr.write("Module/Binary version mismatch\n")
-        sys.stderr.write("Binary: %s\n" % bin_ver)
-        sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
+    ntp.util.stdversioncheck(bin_ver)
     try:
         (options, arguments) = getopt.getopt(sys.argv[1:],
                                              "dD:hl:nsSuV",


=====================================
ntpclients/ntpq.py
=====================================
@@ -1760,10 +1760,7 @@ USAGE: ntpq [-46dphinOV] [-c str] [-D lvl] [host ...]
 
 if __name__ == '__main__':
     bin_ver = "ntpsec- at NTPSEC_VERSION_EXTENDED@"
-    if ntp.util.stdversion() != bin_ver:
-        sys.stderr.write("Module/Binary version mismatch\n")
-        sys.stderr.write("Binary: %s\n" % bin_ver)
-        sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
+    ntp.util.stdversioncheck(bin_ver)
     try:
         (options, arguments) = getopt.getopt(
             sys.argv[1:],


=====================================
ntpclients/ntpsnmpd.py
=====================================
@@ -1115,10 +1115,7 @@ USAGE: ntpsnmpd [-n] [ntp host]
 
 if __name__ == "__main__":
     bin_ver = "ntpsec- at NTPSEC_VERSION_EXTENDED@"
-    if ntp.util.stdversion() != bin_ver:
-        sys.stderr.write("Module/Binary version mismatch\n")
-        sys.stderr.write("Binary: %s\n" % bin_ver)
-        sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
+    ntp.util.stdversioncheck(bin_ver)
     try:
         (options, arguments) = getopt.getopt(
             sys.argv[1:],


=====================================
ntpclients/ntpsweep.py
=====================================
@@ -150,10 +150,7 @@ def scan_host(host, level):
 
 if __name__ == '__main__':
     bin_ver = "ntpsec- at NTPSEC_VERSION_EXTENDED@"
-    if ntp.util.stdversion() != bin_ver:
-        sys.stderr.write("Module/Binary version mismatch\n")
-        sys.stderr.write("Binary: %s\n" % bin_ver)
-        sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
+    ntp.util.stdversioncheck(bin_ver)
     try:
         (options, arguments) = getopt.getopt(
             sys.argv[1:], "h:l:m:ps:?V",


=====================================
ntpclients/ntptrace.py
=====================================
@@ -117,10 +117,7 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.""" + "\n"
 
 bin_ver = "ntpsec- at NTPSEC_VERSION_EXTENDED@"
-if ntp.util.stdversion() != bin_ver:
-    sys.stderr.write("Module/Binary version mismatch\n")
-    sys.stderr.write("Binary: %s\n" % bin_ver)
-    sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
+ntp.util.stdversioncheck(bin_ver)
 
 try:
     (options, arguments) = getopt.getopt(


=====================================
ntpclients/ntpviz.py
=====================================
@@ -1389,11 +1389,7 @@ AADRxQAAxBEAAA==
 
 if __name__ == '__main__':
     bin_ver = "ntpsec- at NTPSEC_VERSION_EXTENDED@"
-    if ntp.util.stdversion() != bin_ver:
-        sys.stderr.write("ntpviz: WARNING: Module/Binary version mismatch\n")
-        sys.stderr.write("ntpviz: WARNING: Binary: %s\n" % bin_ver)
-        sys.stderr.write("ntpviz: WARNING: Module: %s\n" %
-                         ntp.util.stdversion())
+    ntp.util.stdversioncheck(bin_ver)
 
     parser = MyArgumentParser(description="ntpd stats visualizer",
                               fromfile_prefix_chars='@',


=====================================
ntpclients/ntpwait.py
=====================================
@@ -52,10 +52,7 @@ class Unbuffered(object):
 
 if __name__ == "__main__":
     bin_ver = "ntpsec- at NTPSEC_VERSION_EXTENDED@"
-    if ntp.util.stdversion() != bin_ver:
-        sys.stderr.write("Module/Binary version mismatch\n")
-        sys.stderr.write("Binary: %s\n" % bin_ver)
-        sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
+    ntp.util.stdversioncheck(bin_ver)
     try:
         (options, arguments) = getopt.getopt(sys.argv[1:], "hn:s:vV", [
             "tries=", "sleep=", "verbose", "help", "version"


=====================================
pylib/util.py
=====================================
@@ -112,6 +112,14 @@ def stdversion():
     return "ntpsec-%s" % "@NTPSEC_VERSION_EXTENDED@"
 
 
+def stdversioncheck(foreign):
+    "Print a warning to stderr if module and foreign versions do not match."
+    if stdversion() != foreign:
+        sys.stderr.write("Module/Binary version mismatch\n")
+        sys.stderr.write("Binary: %s\n" % foreign)
+        sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
+
+
 def rfc3339(t):
     "RFC 3339 string from Unix time, including fractional second."
     rep = time.strftime("%Y-%m-%dT%H:%M:%S", time.gmtime(t))



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/2dfe4949d9e2902c4a1d94db79098c3f60f0ced9

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/2dfe4949d9e2902c4a1d94db79098c3f60f0ced9
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20230208/90ef0d5c/attachment-0001.htm>