[X2Go-Commits] [x2go-keyring] 18/47: t/keyids-complete.t: adapt to new layout.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2go-keyring.

commit f41673f3e2a2e48dc4e1b37695714099c02bbbc9
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Aug 4 13:56:12 2019 +0200

    t/keyids-complete.t: adapt to new layout.
---
 debian/changelog    |  1 +
 t/keyids-complete.t | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36fd27f..19fe647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ x2go-keyring (2014.07.09) UNRELEASED; urgency=medium
     "team-members" renamed to x2go-maintainers. Added
     x2go-maintainers-removed-keys. Both files get installed as well.
   * runtests: adapt to new layout.
+  * t/keyids-complete.t: adapt to new layout.
   * debian/control:
     - Change maintainer to the mailing list.
     - Add the old package maintainer to the Uploaders field and myself.
diff --git a/t/keyids-complete.t b/t/keyids-complete.t
index bd95043..a38d8c3 100755
--- a/t/keyids-complete.t
+++ b/t/keyids-complete.t
@@ -1,15 +1,15 @@
 #!/bin/bash
 # Makes sure every key in ${project}-{maintainers,keyring}-gpg has an entry in the
-# keyids mapping file.
+# index mapping file.
 set -e
 
 typeset -i fail='0'
 
-for keyring in "x2go-maintainers-gpg" "x2go-keyring-gpg"; do
+for keyring in 'x2go-maintainers' 'x2go-maintainers-removed-keys' 'active-keys' 'removed-keys'; do
   pushd "${keyring}" >'/dev/null'
-  find . -iname '0x*' -print0 | while -r -d '' read key; do
-    if ! grep -q "^${key} " '../keyids'; then
-      echo "${keyring}: ${key} is not in keyids file."
+  find . -iname 'add-*' -print0 | while -r -d '' read key; do
+    if ! grep -q "^${key} " 'index'; then
+      echo "${keyring}: ${key} is not in index file."
       fail='1'
     fi
   done

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git