[Git][NTPsec/ntpsec][master] 2 commits: sys.platform is "sunos5" on Solaris, not "Solaris"

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
301cf5d2 by Matt Selsky at 2016-12-30T04:44:38-05:00
sys.platform is "sunos5" on Solaris, not "Solaris"

- - - - -
9d6027b1 by Matt Selsky at 2016-12-30T04:50:15-05:00
No need to import readline in ntpq itself. Cmd already does it for us.

- - - - -


2 changed files:

- ntpclients/ntpq
- wafhelpers/configure.py


Changes:

=====================================
ntpclients/ntpq
=====================================
--- a/ntpclients/ntpq
+++ b/ntpclients/ntpq
@@ -25,13 +25,6 @@ except ImportError as e:
     sys.stderr.write("%s\n" % e)
     sys.exit(1)
 
-# This import only works on Unixes.  The intention is to enable
-# Ctrl-P, Ctrl-N, and friends in Cmd.
-try:
-    import readline
-except ImportError:
-    pass
-
 version = ntp.util.stdversion()
 
 # General notes on Python 2/3 compatibility:


=====================================
wafhelpers/configure.py
=====================================
--- a/wafhelpers/configure.py
+++ b/wafhelpers/configure.py
@@ -382,7 +382,7 @@ def cmd_configure(ctx, config):
                 ctx.define("HAVE_PPSAPI", 1, comment="Enable the PPS API")
 
         # Check for Solaris capabilities
-        if ctx.get_define("HAVE_PRIV_H") and sys.platform == "Solaris":
+        if ctx.get_define("HAVE_PRIV_H") and sys.platform.startswith("sunos"):
                 ctx.define("HAVE_SOLARIS_PRIVS", 1, comment="Enable Solaris Privileges (Solaris only)")
 
         from wafhelpers.check_sockaddr import check_sockaddr



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/1d834187d4fceb8f10e1e2a82a788d099cc4b4e2...9d6027b15eab3fa3aaa5f430d7fa02e00ee03a70
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20161230/bf70e6e0/attachment.html>