From 8d3d7cabdad3b873722064632968f3ce916b3e99 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 1 Feb 2018 11:51:58 +0100
Subject: add many mysql-TODOs

---
 bin/sanity-check | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bin/sanity-check')

diff --git a/bin/sanity-check b/bin/sanity-check
index 8736d47..e31a5ba 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -5,6 +5,8 @@
 # shellcheck source=conf/default.conf
 . "${0%/*}/../conf/default.conf"
 
+# TODO: read information from database
+
 usage() {
   >&2 echo ''
   >&2 echo 'sanity-check [options] [checks]: check sanity of build master'
-- 
cgit v1.2.3-54-g00ecf


From 07ed3c88e045d84ab282272c9f1b675c15487ba1 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 13 Feb 2018 11:20:08 +0100
Subject: bin/sanity-check: check full name of package in database

---
 bin/sanity-check | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'bin/sanity-check')

diff --git a/bin/sanity-check b/bin/sanity-check
index e31a5ba..39a2d10 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -270,17 +270,18 @@ while [ $# -gt 0 ]; do
 
         errors=$(
           {
-            tar -tzf "${tmp_dir}/${repo}.db.tar.gz" | \
-              grep '/$' | \
-              sed '
-                s|/$||
-                s|^|in_database |
+            tar -Oxzf "${tmp_dir}/${repo}.db.tar.gz" --wildcards '*/desc' 2>/dev/null | \
+              sed -n '
+                /^%FILENAME%$/ {
+                  N
+                  s/^.*\n/in_database /
+                  p
+                }
               '
             echo "${packages}" | \
-              grep '\S' | \
               sed '
-                s|-[^-]\+$||
-                s|^|in_repository |
+                /\.pkg\.tar\.xz$/ !d
+                s/^/in_repository /
               ' | \
               sort -u
           } | \
-- 
cgit v1.2.3-54-g00ecf


From db88d4e5468084e37dbcf46361b04d22248e11fd Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 19 Feb 2018 19:18:32 +0100
Subject: bin/sanity-check: go insane if mysql database is not sane

---
 bin/sanity-check | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'bin/sanity-check')

diff --git a/bin/sanity-check b/bin/sanity-check
index 39a2d10..601a940 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -105,7 +105,7 @@ touch "${tmp_dir}/messages"
 trap 'finish' EXIT
 
 if [ $# -eq 0 ]; then
-  set -- git-repositories build-list repos package-database state-files
+  set -- git-repositories build-list mysql repos package-database state-files
 fi
 
 while [ $# -gt 0 ]; do
@@ -385,6 +385,26 @@ while [ $# -gt 0 ]; do
 
     ;;
 
+    mysql)
+
+      [ ${silence} -gt 0 ] || \
+        printf 'checking mysql-sanity-check-file ...' >> \
+        "${tmp_dir}/messages"
+
+      if [ -s "${webserver_directory}/mysql-sanity.html" ]; then
+        if [ ${silence} -le 1 ]; then
+          printf '\nThere is something wrong with the database:\n'
+          cat "${webserver_directory}/mysql-sanity.html"
+        fi
+        i_am_insane
+      fi
+
+      [ ${silence} -gt 0 ] || \
+        echo ' passed.' >> \
+        "${tmp_dir}/messages"
+
+    ;;
+
     *)
 
       [ ${silence} -gt 1 ] || \
-- 
cgit v1.2.3-54-g00ecf


From 1402c0c7565e1a1ecc55c0383727de5b6ad0dba3 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 8 Mar 2018 09:06:01 +0100
Subject: bin/sanity-check: print into "messages" in case of insane database

---
 bin/sanity-check | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin/sanity-check')

diff --git a/bin/sanity-check b/bin/sanity-check
index 601a940..9487726 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -395,7 +395,8 @@ while [ $# -gt 0 ]; do
         if [ ${silence} -le 1 ]; then
           printf '\nThere is something wrong with the database:\n'
           cat "${webserver_directory}/mysql-sanity.html"
-        fi
+        fi >> \
+          "${tmp_dir}/messages"
         i_am_insane
       fi
 
-- 
cgit v1.2.3-54-g00ecf


From 5423c468f869116deb7de781373b8d35d61a136c Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 8 Mar 2018 09:14:30 +0100
Subject: bin/sanity-check: check for pending mysql queries

---
 bin/sanity-check | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'bin/sanity-check')

diff --git a/bin/sanity-check b/bin/sanity-check
index 9487726..824b7a2 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -400,6 +400,12 @@ while [ $# -gt 0 ]; do
         i_am_insane
       fi
 
+      if find "${work_dir}" -mindepth 1 -maxdepth 1 -name 'tmp.mysql-functions.query.*' | \
+        grep '\S' >> \
+        "${tmp_dir}/messages"; then
+        i_am_insane
+      fi
+
       [ ${silence} -gt 0 ] || \
         echo ' passed.' >> \
         "${tmp_dir}/messages"
-- 
cgit v1.2.3-54-g00ecf


From d39a7bdecd340164c04965be17b51f7ad6de0c5c Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 14 Mar 2018 16:48:36 +0100
Subject: bin/sanity-check: wait 1sec before checking for left over
 tmp.mysql-functions.query files

---
 bin/sanity-check | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin/sanity-check')

diff --git a/bin/sanity-check b/bin/sanity-check
index 824b7a2..b3e02aa 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -400,6 +400,9 @@ while [ $# -gt 0 ]; do
         i_am_insane
       fi
 
+      # hopefully, this gets rid of false positives :-)
+      sleep 1
+
       if find "${work_dir}" -mindepth 1 -maxdepth 1 -name 'tmp.mysql-functions.query.*' | \
         grep '\S' >> \
         "${tmp_dir}/messages"; then
-- 
cgit v1.2.3-54-g00ecf


From 6a69a4c9f2b38b10c26202847f8e64e47a0306fe Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 19 Mar 2018 22:10:52 +0100
Subject: #archlinux-ports -> #archlinux32

---
 bin/build-master-status-from-mysql | 2 +-
 bin/get-package-updates            | 2 +-
 bin/ii-connect                     | 6 +++---
 bin/return-assignment              | 4 ++--
 bin/sanity-check                   | 4 ++--
 lib/mysql-functions                | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'bin/sanity-check')

diff --git a/bin/build-master-status-from-mysql b/bin/build-master-status-from-mysql
index 3918489..2c33708 100755
--- a/bin/build-master-status-from-mysql
+++ b/bin/build-master-status-from-mysql
@@ -249,7 +249,7 @@ find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 \
 if [ -s "${webserver_directory}/mysql-sanity.html" ] && \
   [ ! -s "${work_dir}/build-master-sanity" ]; then
   printf 'girls: my database is dirty again ...\n' | \
-    sponge "${irc_dir}/#archlinux-ports/in"
+    sponge "${irc_dir}/#archlinux32/in"
   echo 'build master is insane' > \
     "${work_dir}/build-master-sanity"
 fi
diff --git a/bin/get-package-updates b/bin/get-package-updates
index 1cf8782..d3cb140 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -480,7 +480,7 @@ if [ "${deletion_list_count}" -gt 1000 ]; then
       done
     } | \
       tee "${work_dir}/told-irc-about-too-many-deletion-list-packages" | \
-      sponge "${irc_dir}/#archlinux-ports/in"
+      sponge "${irc_dir}/#archlinux32/in"
   fi
   exit 3
 fi
diff --git a/bin/ii-connect b/bin/ii-connect
index 973b227..cf332c0 100755
--- a/bin/ii-connect
+++ b/bin/ii-connect
@@ -19,12 +19,12 @@ if tail -n1 "${irc_dir}/nickserv/out" 2> /dev/null | \
     sponge "${irc_dir}/nickserv/in"
 fi
 
-# join #archlinux-ports if not yet done
+# join #archlinux32 if not yet done
 if ! grep ' buildmaster\.archlinux32\.org .* buildmaster$' "${irc_dir}/out" | \
   tail -n1 | \
-  grep -q ' #archlinux-ports '; then
+  grep -q ' #archlinux32 '; then
   {
-    echo '/j #archlinux-ports'
+    echo '/j #archlinux32'
     echo '/WHO buildmaster'
   } | \
     sponge "${irc_dir}/in"
diff --git a/bin/return-assignment b/bin/return-assignment
index a61460e..417654b 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -222,7 +222,7 @@ if [ "$5" = 'ERROR' ]; then
       fi
     )
 
-    if [ -p "${irc_dir}/#archlinux-ports/in" ]; then
+    if [ -p "${irc_dir}/#archlinux32/in" ]; then
       {
         printf '%s is broken (says %s).' \
           "$1" \
@@ -235,7 +235,7 @@ if [ "$5" = 'ERROR' ]; then
         fi
         printf '\n'
       } | \
-        sponge "${irc_dir}/#archlinux-ports/in"
+        sponge "${irc_dir}/#archlinux32/in"
     fi
   fi
 
diff --git a/bin/sanity-check b/bin/sanity-check
index b3e02aa..d98332c 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -22,7 +22,7 @@ usage() {
 i_am_insane() {
   if [ ! -s "${work_dir}/build-master-sanity" ]; then
     printf '\001ACTION goes insane.\001\n' | \
-      sponge "${irc_dir}/#archlinux-ports/in"
+      sponge "${irc_dir}/#archlinux32/in"
   fi
   echo 'build master is insane' > \
     "${work_dir}/build-master-sanity"
@@ -432,5 +432,5 @@ done
 if [ -f "${work_dir}/build-master-sanity" ]; then
   rm "${work_dir}/build-master-sanity"
   printf '\001ACTION resumes sanity.\001\n' | \
-    sponge "${irc_dir}/#archlinux-ports/in"
+    sponge "${irc_dir}/#archlinux32/in"
 fi
diff --git a/lib/mysql-functions b/lib/mysql-functions
index b9ae4ab..0b21bdf 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -83,7 +83,7 @@ mysql_run_query() {
       if [ ! -s "${work_dir}/build-master-sanity" ]; then
         printf '\001ACTION failed to execute a mysql query - can you have a look at "%s"?.\001\n' \
           "${query_file##*/}" \
-          | sponge "${irc_dir}/#archlinux-ports/in"
+          | sponge "${irc_dir}/#archlinux32/in"
       fi
       echo 'A mysql query failed.' > \
         "${work_dir}/build-master-sanity"
-- 
cgit v1.2.3-54-g00ecf


From bd5173dc0c845e0e01de8aed01bd85b0e6646344 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 20 Mar 2018 10:33:35 +0100
Subject: lib/common-functions: irc_say new

---
 bin/build-master-status-from-mysql |  2 +-
 bin/get-package-updates            |  2 +-
 bin/return-assignment              | 28 +++++++++++++---------------
 bin/sanity-check                   |  4 ++--
 lib/common-functions               |  8 ++++++++
 lib/mysql-functions                |  2 +-
 6 files changed, 26 insertions(+), 20 deletions(-)

(limited to 'bin/sanity-check')

diff --git a/bin/build-master-status-from-mysql b/bin/build-master-status-from-mysql
index 729375f..e4dd313 100755
--- a/bin/build-master-status-from-mysql
+++ b/bin/build-master-status-from-mysql
@@ -249,7 +249,7 @@ find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 \
 if [ -s "${webserver_directory}/mysql-sanity.html" ] && \
   [ ! -s "${work_dir}/build-master-sanity" ]; then
   printf 'oh girls, my database is dirty again ...\n' | \
-    sponge "${irc_dir}/#archlinux32/in"
+    irc_say
   echo 'build master is insane' > \
     "${work_dir}/build-master-sanity"
 fi
diff --git a/bin/get-package-updates b/bin/get-package-updates
index d3cb140..a6c3f32 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -480,7 +480,7 @@ if [ "${deletion_list_count}" -gt 1000 ]; then
       done
     } | \
       tee "${work_dir}/told-irc-about-too-many-deletion-list-packages" | \
-      sponge "${irc_dir}/#archlinux32/in"
+      irc_say
   fi
   exit 3
 fi
diff --git a/bin/return-assignment b/bin/return-assignment
index 417654b..c259f1c 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -222,21 +222,19 @@ if [ "$5" = 'ERROR' ]; then
       fi
     )
 
-    if [ -p "${irc_dir}/#archlinux32/in" ]; then
-      {
-        printf '%s is broken (says %s).' \
-          "$1" \
-          "${slave}"
-        if [ -n "${rescheduled_packages}" ]; then
-          printf -- ' - I rescheduled:'
-          # shellcheck disable=SC2086
-          printf ' %s,' ${rescheduled_packages} | \
-            sed 's/,$/./'
-        fi
-        printf '\n'
-      } | \
-        sponge "${irc_dir}/#archlinux32/in"
-    fi
+    {
+      printf '%s is broken (says %s).' \
+        "$1" \
+        "${slave}"
+      if [ -n "${rescheduled_packages}" ]; then
+        printf -- ' - I rescheduled:'
+        # shellcheck disable=SC2086
+        printf ' %s,' ${rescheduled_packages} | \
+          sed 's/,$/./'
+      fi
+      printf '\n'
+    } | \
+      irc_say
   fi
 
   exit 0
diff --git a/bin/sanity-check b/bin/sanity-check
index d98332c..9615ac7 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -22,7 +22,7 @@ usage() {
 i_am_insane() {
   if [ ! -s "${work_dir}/build-master-sanity" ]; then
     printf '\001ACTION goes insane.\001\n' | \
-      sponge "${irc_dir}/#archlinux32/in"
+      irc_say
   fi
   echo 'build master is insane' > \
     "${work_dir}/build-master-sanity"
@@ -432,5 +432,5 @@ done
 if [ -f "${work_dir}/build-master-sanity" ]; then
   rm "${work_dir}/build-master-sanity"
   printf '\001ACTION resumes sanity.\001\n' | \
-    sponge "${irc_dir}/#archlinux32/in"
+    irc_say
 fi
diff --git a/lib/common-functions b/lib/common-functions
index 1abe7bc..aa32409 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -1390,3 +1390,11 @@ extract_pkgname_epoch_pkgver_pkgrel_sub_pkgrel_arch_from_package_name() {
     epoch="${epoch%%:*}"
   fi
 }
+
+# irc_say
+# say content of stdin in irc channel
+irc_say() {
+  if [ -p "${irc_dir}/#archlinux32/in" ]; then
+    sponge "${irc_dir}/#archlinux32/in"
+  fi
+}
diff --git a/lib/mysql-functions b/lib/mysql-functions
index 0b21bdf..801eca2 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -83,7 +83,7 @@ mysql_run_query() {
       if [ ! -s "${work_dir}/build-master-sanity" ]; then
         printf '\001ACTION failed to execute a mysql query - can you have a look at "%s"?.\001\n' \
           "${query_file##*/}" \
-          | sponge "${irc_dir}/#archlinux32/in"
+          | irc_say
       fi
       echo 'A mysql query failed.' > \
         "${work_dir}/build-master-sanity"
-- 
cgit v1.2.3-54-g00ecf


From 60e7e5a033f0069624bab1754a794e82ec105818 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 22 Mar 2018 14:56:14 +0100
Subject: bin/sanity-check: compare master mirror to tracking information in
 mysql database

---
 bin/sanity-check | 79 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 40 deletions(-)

(limited to 'bin/sanity-check')

diff --git a/bin/sanity-check b/bin/sanity-check
index 9615ac7..3defce2 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -105,7 +105,7 @@ touch "${tmp_dir}/messages"
 trap 'finish' EXIT
 
 if [ $# -eq 0 ]; then
-  set -- git-repositories build-list mysql repos package-database state-files
+  set -- git-repositories build-list mysql repos package-database track-state
 fi
 
 while [ $# -gt 0 ]; do
@@ -337,51 +337,50 @@ while [ $# -gt 0 ]; do
 
     ;;
 
-    state-files)
+    track-state)
 
-      for status in 'staging' 'testing'; do
-
-        [ ${silence} -gt 0 ] || \
-          printf 'checking state-files of "%s" ...' "${status}" >> \
-          "${tmp_dir}/messages"
+      [ ${silence} -gt 0 ] || \
+        printf 'checking if all packages are tracked correctly ...' >> \
+        "${tmp_dir}/messages"
 
-        errors=$(
+      errors=$(
+        {
+          # shellcheck disable=SC2016
           {
-            if [ "${status}" = 'staging' ]; then
-              find "${work_dir}/package-states" -name '*.done' \
-                -exec sed 's|^|package-state-file |' '{}' \;
-            else
-              find "${work_dir}/package-states" \( -name '*.testing' -o -name '*.tested' \) \
-                -exec sed 's|^|package-state-file |' '{}' \;
-            fi
-            ls_master_mirror 'i686' | \
-              grep "${status}\$" | \
-              while read -r repo; do
-                ls_master_mirror "i686/${repo}"
-              done | \
-              grep '\.pkg\.tar\.xz$' | \
-              sed 's|^|package-file |'
+            printf 'SELECT "mysql",CONCAT(`repositories`.`name`,"/",'
+            mysql_package_name_query
+            printf ') FROM `binary_packages`'
+            mysql_join_binary_packages_repositories
+            printf ' AND `repositories`.`is_on_master_mirror`'
+            mysql_join_binary_packages_architectures
           } | \
-            sort -k2 | \
-            uniq -cf1 | \
-            grep -v '^\s*2\s' | \
-            awk '{print $2 " " $3}'
-        )
-        if [ -n "${errors}" ]; then
-          if [ ${silence} -le 1 ]; then
-            printf '\nThe following %s packages do not have state files or vice versa:\n%s\n' \
-              "${status}" \
-              "${errors}" >> \
-              "${tmp_dir}/messages"
-          fi
-          i_am_insane
+            mysql_run_query | \
+            tr '\t' ' '
+          ls_master_mirror 'i686' | \
+            while read -r repo; do
+              ls_master_mirror "i686/${repo}" | \
+                sed '
+                  /\.pkg\.tar\.xz$/!d
+                  s,^,package-file '"${repo}"'/,
+                '
+            done
+        } | \
+          sed 's/\(-[0-9]\+\)\.0\(-[^- ]\+$\)/\1\2/' | \
+          sort -k2 | \
+          uniq -uf1
+      )
+      if [ -n "${errors}" ]; then
+        if [ ${silence} -le 1 ]; then
+          printf '\nThe following packages from the master mirror are not tracked in the database or vice versa:\n%s\n' \
+            "${errors}" >> \
+            "${tmp_dir}/messages"
         fi
+        i_am_insane
+      fi
 
-        [ ${silence} -gt 0 ] || \
-          echo ' passed.' >> \
-          "${tmp_dir}/messages"
-
-      done
+      [ ${silence} -gt 0 ] || \
+        echo ' passed.' >> \
+        "${tmp_dir}/messages"
 
     ;;
 
-- 
cgit v1.2.3-54-g00ecf


From 1719184bafa03d92bc8eae895704aa446e0bd587 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 22 Mar 2018 15:11:14 +0100
Subject: bin/sanity-check: remove done TODO

---
 bin/sanity-check | 2 --
 1 file changed, 2 deletions(-)

(limited to 'bin/sanity-check')

diff --git a/bin/sanity-check b/bin/sanity-check
index 3defce2..4398595 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -5,8 +5,6 @@
 # shellcheck source=conf/default.conf
 . "${0%/*}/../conf/default.conf"
 
-# TODO: read information from database
-
 usage() {
   >&2 echo ''
   >&2 echo 'sanity-check [options] [checks]: check sanity of build master'
-- 
cgit v1.2.3-54-g00ecf


From d22efbc22053a482c6d1b9f264b12d54f509508c Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 22 Mar 2018 15:30:45 +0100
Subject: bin/sanity-check: read more information from the database

---
 bin/sanity-check | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'bin/sanity-check')

diff --git a/bin/sanity-check b/bin/sanity-check
index 4398595..e6b4184 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -145,20 +145,19 @@ while [ $# -gt 0 ]; do
         "${tmp_dir}/messages"
 
       errors=$(
-        grep -vn '^\S\+ [0-9a-f]\{40\} [0-9a-f]\{40\} \S\+$' "${work_dir}/build-list"
-      ) || true
-      if [ -n "${errors}" ]; then
-        if [ ${silence} -le 1 ]; then
-          printf '\nThe following build orders are wrongly formatted:\n%s\n' \
-            "${errors}" >> \
-            "${tmp_dir}/messages"
-        fi
-        i_am_insane
-      fi
-
-      errors=$(
-        cut -d' ' -f1 < \
-          "${work_dir}/build-list" | \
+        # shellcheck disable=SC2016
+        {
+          printf 'SELECT `architectures`.`name`,`package_sources`.`pkgbase` FROM `package_sources`'
+          mysql_join_package_sources_build_assignments
+          mysql_join_build_assignments_architectures
+          printf ' WHERE EXISTS('
+            printf 'SELECT * FROM `binary_packages`'
+            mysql_join_binary_packages_repositories
+            printf ' WHERE `repositories`.`name`="build-list"'
+            printf ' AND `binary_packages`.`build_assignment`=`build_assignments`.`id`'
+          printf ');\n'
+        } | \
+          mysql_run_query | \
           sort | \
           uniq -d
       )
@@ -172,13 +171,16 @@ while [ $# -gt 0 ]; do
       fi
 
       errors=$(
+        # shellcheck disable=SC2016
         {
-          cut -d' ' -f1 < \
-            "${work_dir}/build-list"
-          cat "${work_dir}/deletion-list"
+          printf 'SELECT `a`.`pkgname` FROM `binary_packages` AS `a`'
+          mysql_join_binary_packages_repositories 'a' 'a_r'
+          printf ' AND `a_r`.`name`="build-list"'
+          printf ' JOIN `binary_packages` AS `b` ON `a`.`pkgname`=`b`.`pkgname`'
+          mysql_join_binary_packages_repositories 'b' 'b_r'
+          printf ' AND `b_r`.`name`="deletion-list";\n'
         } | \
-          sort | \
-          uniq -d
+          mysql_run_query
       )
       if [ -n "${errors}" ]; then
         if [ ${silence} -le 1 ]; then
-- 
cgit v1.2.3-54-g00ecf


From b798f420fda3be00914a8ac7a5817b651a9858f4 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 23 Mar 2018 09:48:51 +0100
Subject: bin/sanity-check: check git heads in database, not in files

---
 bin/sanity-check | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'bin/sanity-check')

diff --git a/bin/sanity-check b/bin/sanity-check
index e6b4184..7d1b2f0 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -119,16 +119,28 @@ while [ $# -gt 0 ]; do
       for repo in ${repo_names}; do
         eval 'repo_path="${repo_paths__'"${repo}"'}"'
         repo_revision=$(
-          cat "${work_dir}/${repo}.revision"
+          # shellcheck disable=SC2016
+          {
+            printf 'SELECT `git_repositories`.`head` FROM `git_repositories`'
+            printf ' WHERE `git_repositories`.`name`=from_base64("%s");\n' \
+              "$(printf '%s' "${repo}" | base64 -w0)"
+          } | \
+            mysql_run_query
         )
-        if ! git -C "${repo_path}" archive "${repo_revision}" -- | \
-          tar -t > /dev/null; then
+        if ! obj_type=$(git -C "${repo_path}" cat-file -t "${repo_revision}" 2>/dev/null); then
           if [ ${silence} -le 1 ]; then
-            printf '\nThe repository %s (%s) cannot archive the current revision %s.\n' \
+            printf '\nThe repository %s (%s) does not know the current revision %s.\n' \
               "${repo}" "${repo_path}" "${repo_revision}" >> \
               "${tmp_dir}/messages"
           fi
           i_am_insane
+        elif [ "${obj_type}" != 'commit' ]; then
+          if [ ${silence} -le 1 ]; then
+            printf '\nThe repository %s (%s) knows the current revision %s, but it is not a commit, but a %s.\n' \
+              "${repo}" "${repo_path}" "${repo_revision}" "${obj_type}" >> \
+              "${tmp_dir}/messages"
+          fi
+          i_am_insane
         fi
       done
 
-- 
cgit v1.2.3-54-g00ecf