[Git][NTPsec/ntpsec][master] 4 commits: Typo, remove unused python import

[Eric S. Raymond]

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


Commits:
804cc57e by Matt Selsky at 2016-09-10T09:28:55-04:00
Typo, remove unused python import

- - - - -
48132db5 by Matt Selsky at 2016-09-10T09:28:55-04:00
No need to check for perl at build time.

- - - - -
0bf3ff9a by Matt Selsky at 2016-09-10T09:28:55-04:00
Avoid warning about unused parameter 'json' on systems without adjtimex()

- - - - -
17d498ed by Matt Selsky at 2016-09-10T09:28:55-04:00
Fix do_rmvars in pyntpq

Use correct variable name for user input
Fix copy-pasta from do_addvars

- - - - -


6 changed files:

- README
- contrib/README
- contrib/temper-temp-log
- ntpfrob/tickadj.c
- ntpq/pyntpq
- wafhelpers/configure.py


Changes:

=====================================
README
=====================================
--- a/README
+++ b/README
@@ -103,7 +103,7 @@ tests/::	Self-test code.
 util/:: 	Directory containing sources for various utility and testing
 		programs that are *not* part of a normal installation.
 		The subdirectories monitoring/ and support/ hold
-		various perl and shell scripts for visualizing
+		various Python and shell scripts for visualizing
 		synchronization and daemon startup.
 
 waf::		A copy of the waf builder.  This is the engine used to configure


=====================================
contrib/README
=====================================
--- a/contrib/README
+++ b/contrib/README
@@ -18,4 +18,4 @@ to stdout.  Useful to create a log that can be used by 'ntpviz
 temper-temp-log for TEMPer USB thermometer.  Useful for logging room
 temperature.  This reads the thermometer using the temper-python command
 line utility and writes the temperatures to stdout.  Useful to create a
-og that can be used by 'ntpviz --local-temps'
+log that can be used by 'ntpviz --local-temps'


=====================================
contrib/temper-temp-log
=====================================
--- a/contrib/temper-temp-log
+++ b/contrib/temper-temp-log
@@ -29,7 +29,7 @@ Sample crontab usage:
 """
 
 
-import re, time, subprocess
+import time, subprocess
 
 output = subprocess.check_output(["temper-poll", "-c"], universal_newlines=True)
 


=====================================
ntpfrob/tickadj.c
=====================================
--- a/ntpfrob/tickadj.c
+++ b/ntpfrob/tickadj.c
@@ -2,7 +2,7 @@
  * tickadj - read, and possibly modify, the kernel `tick' and
  *	     `tickadj' variables', using adjtimex(2).  This is
  *	     included only for compatibility with old scripts.
- *	     and its former support for unsafe /dev/kmem operations
+ *	     Its former support for unsafe /dev/kmem operations
  *	     has been removed.
  *
  * Copyright 2015 by the NTPsec project contributors
@@ -29,6 +29,7 @@ static struct timex txc;
 void tickadj(const bool json, const int newtick)
 {
 #ifndef HAVE_ADJTIMEX
+	UNUSED_ARG(json);
 	UNUSED_ARG(newtick);
 	fputs("ntpfrob: \n", stderr);
 	exit(1);


=====================================
ntpq/pyntpq
=====================================
--- a/ntpq/pyntpq
+++ b/ntpq/pyntpq
@@ -452,16 +452,16 @@ usage: keytype [ key type (md5|des) ]
 
     def do_rmvars(self, line):
         "remove variables from the variable list"
-        if add_var == "":
+        if line == "":
             print("usage rmvars name[,...]")
             return
 
-        vars_to_add = line.split(',')
-        for add_var in vars_to_add:
-            if add_var not in uservars:
-                print ("%s is not in the variable list" % add_var.split("=")[0])
+        vars_to_rm = line.split(',')
+        for rm_var in vars_to_rm:
+            if rm_var not in uservars:
+                print ("%s is not in the variable list" % rm_var)
             else:
-                del uservars[add_var]
+                del uservars[rm_var]
 
     def do_clearvars(self, line):
         "remove all variables from the variable list"


=====================================
wafhelpers/configure.py
=====================================
--- a/wafhelpers/configure.py
+++ b/wafhelpers/configure.py
@@ -62,7 +62,6 @@ def cmd_configure(ctx, config):
 
 	# Not needed to build.  Used by utility scripts.
 	ctx.find_program("awk", var="BIN_AWK", mandatory=False)
-	ctx.find_program("perl", var="BIN_PERL", mandatory=False)
 	ctx.find_program("sh", var="BIN_SH", mandatory=False)
 
 	# used to make man and html pages



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/17fba426d862850426a595c996500dcb90e85600...17d498edc2d14857aae6753788c37ba028ea77c8
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160910/4c393a74/attachment.html>