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

[Eric S. Raymond]

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


Commits:
4226b067 by Matt Selsky at 2016-12-09T00:03:13-05:00
Typo

- - - - -
af37667f by Matt Selsky at 2016-12-09T00:03:13-05:00
Give a hint about why module import failed in ntpmon, like we do for ntpq and ntpviz

- - - - -
28cd12fa by Matt Selsky at 2016-12-09T00:03:13-05:00
Remove unused import "os" from ntpmon

- - - - -
f31ec4bb by Matt Selsky at 2016-12-09T00:03:13-05:00
Remove double "import curses" from ntpmon

- - - - -


2 changed files:

- ntpclients/ntpmon
- pylib/util.py


Changes:

=====================================
ntpclients/ntpmon
=====================================
--- a/ntpclients/ntpmon
+++ b/ntpclients/ntpmon
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-2-clause
 from __future__ import print_function, division
 
-import os, sys, curses, time, getopt
+import sys, time, getopt
 
 try:
     import ntp.packet
@@ -14,14 +14,16 @@ try:
     import ntp.version
     import ntp.control
     import ntp.magic
-except ImportError:
+except ImportError as e:
     sys.stderr.write("ntpmon: can't find Python NTP library -- check PYTHONPATH.\n")
+    sys.stderr.write("%s\n" % e)
     sys.exit(1)
 
 try:
     import curses
-except ImportError:
+except ImportError as e:
     sys.stderr.write("ntpmon: can't find Python curses library -- check PYTHONPATH.\n")
+    sys.stderr.write("%s\n" % e)
     sys.exit(1)
 
 stdscr = None


=====================================
pylib/util.py
=====================================
--- a/pylib/util.py
+++ b/pylib/util.py
@@ -45,7 +45,7 @@ def portsplit(hostname):
             hostname = hostname[1:-1]	# Strip brackets
     return (hostname, portsuffix)
 
-# A hack to avoid repleatedly hammering on DNS when ntpmon runs.
+# A hack to avoid repeatedly hammering on DNS when ntpmon runs.
 canonicalization_cache = {}
 
 def canonicalize_dns(inhost, family=socket.AF_UNSPEC):



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/aa3482199560311fd21182ced26fb74c5c1a00f4...f31ec4bbd6e819c0fe4632d35fb2a293b19399d5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20161209/8c26e31d/attachment.html>