[Git][NTPsec/ntpsec][master] 2 commits: pyhon ntpclients 'module'

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
4d795f47 by James Browning at 2019-01-31T03:18:40Z
pyhon ntpclients 'module'

- - - - -
00a919ab by James Browning at 2019-01-31T03:18:40Z
pyhon ntpclients nonfatal

- - - - -


8 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


Changes:

=====================================
ntpclients/ntpdig.py
=====================================
@@ -264,10 +264,9 @@ 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("Library/Binary version mismatch\n")
+        sys.stderr.write("Module/Binary version mismatch\n")
         sys.stderr.write("Binary: %s\n" % bin_ver)
-        sys.stderr.write("Library: %s\n" % ntp.util.stdversion())
-        raise SystemExit(1)
+        sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
     try:
         try:
             (options, arguments) = getopt.getopt(


=====================================
ntpclients/ntpmon.py
=====================================
@@ -213,10 +213,9 @@ 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("Library/Binary version mismatch\n")
+        sys.stderr.write("Module/Binary version mismatch\n")
         sys.stderr.write("Binary: %s\n" % bin_ver)
-        sys.stderr.write("Library: %s\n" % ntp.util.stdversion())
-        raise SystemExit(1)
+        sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
     try:
         (options, arguments) = getopt.getopt(sys.argv[1:],
                                              "dD:hl:nuV",


=====================================
ntpclients/ntpq.py
=====================================
@@ -1565,10 +1565,9 @@ 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("Library/Binary version mismatch\n")
+        sys.stderr.write("Module/Binary version mismatch\n")
         sys.stderr.write("Binary: %s\n" % bin_ver)
-        sys.stderr.write("Library: %s\n" % ntp.util.stdversion())
-        raise SystemExit(1)
+        sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
     try:
         (options, arguments) = getopt.getopt(
             sys.argv[1:],


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


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


=====================================
ntpclients/ntptrace.py
=====================================
@@ -118,10 +118,9 @@ hyphen and the flag character.""" + "\n"
 
 bin_ver = "ntpsec- at NTPSEC_VERSION_EXTENDED@"
 if ntp.util.stdversion() != bin_ver:
-    sys.stderr.write("Library/Binary version mismatch\n")
+    sys.stderr.write("Module/Binary version mismatch\n")
     sys.stderr.write("Binary: %s\n" % bin_ver)
-    sys.stderr.write("Library: %s\n" % ntp.util.stdversion())
-    raise SystemExit(1)
+    sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
 
 try:
     (options, arguments) = getopt.getopt(


=====================================
ntpclients/ntpviz.py
=====================================
@@ -1364,10 +1364,9 @@ AADRxQAAxBEAAA==
 if __name__ == '__main__':
     bin_ver = "ntpsec- at NTPSEC_VERSION_EXTENDED@"
     if ntp.util.stdversion() != bin_ver:
-        sys.stderr.write("Library/Binary version mismatch\n")
+        sys.stderr.write("Module/Binary version mismatch\n")
         sys.stderr.write("Binary: %s\n" % bin_ver)
-        sys.stderr.write("Library: %s\n" % ntp.util.stdversion())
-        raise SystemExit(1)
+        sys.stderr.write("Module: %s\n" % ntp.util.stdversion())
 
     parser = MyArgumentParser(description="ntpd stats visualizer",
                               fromfile_prefix_chars='@',


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



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/8f8ab8477b7d192ca6f8fad233dc1cbf2b09aaf2...00a919ab2c87484f82a78416acfbacb336032962

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/8f8ab8477b7d192ca6f8fad233dc1cbf2b09aaf2...00a919ab2c87484f82a78416acfbacb336032962
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/20190131/3719333d/attachment-0001.html>