[Git][NTPsec/ntpsec][master] 3 commits: Correct some baroque GPG options.

[Eric S. Raymond]

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


Commits:
3675ed7f by Eric S. Raymond at 2016-12-06T03:25:22-05:00
Correct some baroque GPG options.

- - - - -
0ebe70f0 by Eric S. Raymond at 2016-12-06T03:25:22-05:00
Fix autobuild of the autorevision cache file.

- - - - -
17f1dd8f by Eric S. Raymond at 2016-12-06T03:32:57-05:00
Address GitLab issue #193: ntpq rv has debug output.

- - - - -


3 changed files:

- devel/release
- ntpq/ntpq
- pylib/wscript


Changes:

=====================================
devel/release
=====================================
--- a/devel/release
+++ b/devel/release
@@ -29,7 +29,7 @@ $do git push
 $do git push --tags
 
 # Generate GPG detached signature of the release tarball.
-$do gpg -u ${K} --output ntpsec-${V}.tar.gz.sig --detach-sig ntpsec-${V}.tar.gz
+$do gpg -u ${K} -a --output ntpsec-${V}.tar.gz.sum.asc --sign ntpsec-${V}.tar.gz.sum
 
 # Generate sha256sum file for the release tarball.
 $do shasum -a 256 -p ntpsec-${V}.tar.gz >ntpsec-${V}.tar.gz.sum


=====================================
ntpq/ntpq
=====================================
--- a/ntpq/ntpq
+++ b/ntpq/ntpq
@@ -521,7 +521,6 @@ usage: help [ command ]
     def __dolist(self, varlist, associd, op, type, quiet=False):
         "List variables associated with a specified peer."
         try:
-            print("Qerying %d" % associd)
             variables = self.session.readvar(associd, varlist, op)
         except ntp.packet.ControlException as e:
             self.warn(e.message + "\n")


=====================================
pylib/wscript
=====================================
--- a/pylib/wscript
+++ b/pylib/wscript
@@ -12,6 +12,7 @@ def build(ctx):
     target1 = ctx.srcnode.make_node('pylib/ntp_control.py')
     target2 = ctx.srcnode.make_node('pylib/ntp_magic.py')
     target3 = ctx.srcnode.make_node('pylib/version.py')
+    target4 = ctx.srcnode.make_node('wafhelpers/.autorevision-cache')
 
     ctx(
 	before      = ['pyc', 'pyo'],
@@ -32,9 +33,9 @@ def build(ctx):
     ctx(
 	before      = ['pyc', 'pyo'],
 	cwd         = srcnode,
-	rule        = 'VCS_EXTRA=`cat ${SRC}` ../wafhelpers/autorevision.sh -o ${TGT[1].abspath()} -e VERSION -t python >${TGT[0].name}',
-	source      = "../VERSION",
-	target      = [target3, '../wafhelpers/.autorevision-cache', '../wafhelpers/autorevision.sh'],
+	rule        = 'VCS_EXTRA=`cat ${SRC[0]}` ../wafhelpers/autorevision.sh -o ${TGT[1].abspath()} -e VERSION -t python >${TGT[0].name}',
+	source      = ["../VERSION", '../wafhelpers/autorevision.sh'] ,
+	target      = [target3, target4],
 	)
 
     ctx.add_group() # Force early creation of generated files



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/3f69919cefc3bc25ce61d3f27ad676748510dbae...17f1dd8f932cabfc8a9021176ec9b8504c81070a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20161206/3e758fd9/attachment.html>