[Git][NTPsec/ntpsec][b301-fix] 2 commits: Enable gcc:7 CI checks

[Ian Bruene]

Ian Bruene pushed to branch b301-fix at NTPsec / ntpsec


Commits:
a105af26 by Matt Selsky at 2017-05-10T02:41:53-04:00
Enable gcc:7 CI checks

- - - - -
7dc252e1 by Ian Bruene at 2017-05-10T09:25:30-05:00
Fixed type bug in packet.py

packet.Authenticator.control attempted to cat a pair of tuples together, but
the first tuple was malformed: missing the trailing comma of a single
element tuple.

- - - - -


2 changed files:

- .gitlab-ci.yml
- pylib/packet.py


Changes:

=====================================
.gitlab-ci.yml
=====================================
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,3 +47,22 @@ debian-jessie-refclocks:
     - python ./waf configure --refclock=all build
   tags:
     - debian-jessie
+
+gcc-7-basic:
+  <<: *job_definition
+  image: gcc:7
+  script:
+    - apt-get update -qq && apt-get install -y -qq bison libcap-dev pps-tools python-dev
+    - python ./waf configure build
+  tags:
+    - gitlab-org
+
+gcc-7-refclocks:
+  <<: *job_definition
+  image: gcc:7
+  script:
+    - apt-get update -qq && apt-get install -y -qq bison libcap-dev pps-tools python-dev
+    - python ./waf configure --refclock=all build
+  tags:
+    - gitlab-org
+


=====================================
pylib/packet.py
=====================================
--- a/pylib/packet.py
+++ b/pylib/packet.py
@@ -1664,7 +1664,7 @@ class Authenticator:
         "Get a keyid/passwd pair that is trusted on localhost"
         if keyid is not None:
             if keyid in self.passwords:
-                return (keyid) + self.passwords[keyid]
+                return (keyid,) + self.passwords[keyid]
             else:
                 return (keyid, None, None)
         for line in open("/etc/ntp.conf"):



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/28db46686994c7d40239174b606166195f5027fa...7dc252e10d5c8458f2de088f0602e27a69984ff5

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/28db46686994c7d40239174b606166195f5027fa...7dc252e10d5c8458f2de088f0602e27a69984ff5
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/20170510/6cc03cc6/attachment.html>