From a90b95bdc1fe389eadce4461080bff23176bd6b3 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 15 Feb 2019 08:41:43 +0100
Subject: lib/mysql-functions: mysql_sanity_check() check for left-over
 signatures in pool/, too

---
 lib/mysql-functions | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'lib/mysql-functions')

diff --git a/lib/mysql-functions b/lib/mysql-functions
index 16b7544..950e4ac 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -718,13 +718,9 @@ mysql_sanity_check() {
     # shellcheck disable=SC2041
     ls_master_mirror 'pool' | \
       sed '
-        s/\.sig$//
-        /\.pkg\.tar\.xz$/ !d
+        /\.pkg\.tar\.xz\(\.sig\)\?$/ !d
       ' | \
-      sort | \
-      uniq -c | \
-      grep '^\s*2\s' | \
-      awk '{print $2}' > \
+      sort -u > \
       "${temp_dir}/master-mirror-pool"
 
     {
@@ -747,6 +743,9 @@ mysql_sanity_check() {
       printf ')'
     } | \
       mysql_run_query | \
+      sed '
+        s/^.*$/\0\n\0.sig/
+      ' | \
       sort > \
       "${temp_dir}/mysql-packages-pool"
 
-- 
cgit v1.2.3-54-g00ecf