[X2Go-Commits] [x2go-keyring] 04/04: t/keyids-complete.t: fix key name checking.

[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 e1bc4d45f71938ebe30019528bb8b2066fbe9603
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Aug 4 16:48:27 2019 +0200

    t/keyids-complete.t: fix key name checking.
---
 debian/changelog    | 1 +
 t/keyids-complete.t | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2be039b..0632450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,7 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium
   * runtests: fix tempdir -> tmpdir typo.
   * t/keyids-complete.t: fix stupid while -r ... read typo.
   * t/keyids-complete.t: avoid using a subshell via pipes.
+  * t/keyids-complete.t: fix key name checking.
   * 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 47db68d..c4e62b9 100755
--- a/t/keyids-complete.t
+++ b/t/keyids-complete.t
@@ -8,7 +8,8 @@ typeset -i fail='0'
 for keyring in 'x2go-maintainers' 'x2go-maintainers-removed-keys' 'active-keys' 'removed-keys'; do
   pushd "${keyring}" >'/dev/null'
   while read -r -d '' key; do
-    if ! grep -q "^${key} " 'index'; then
+    key="${key#./}"
+    if ! grep -Eq "  ${key}\$" 'index'; then
       echo "${keyring}: ${key} is not in index file."
       fail='1'
     fi

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