bin/build-master-status-from-mysql: ignore build-dependencies which are in the database but not in the files (some old dependencies will get removed from the files, but not (yet) from the database)

1 files changed, 9 insertions, 6 deletions

diff --git a/bin/build-master-status-from-mysql b/bin/build-master-status-from-mysql
index 6ed2e84..16afb9f 100755
--- a/bin/build-master-status-from-mysql
+++ b/bin/build-master-status-from-mysql
@@ -180,12 +180,15 @@ find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 \
   ' | \
   sort -u > \
   "${tmp_dir}/build-dependencies.mysql"
-find "${work_dir}/package-infos" -name '*.build-depends' \
-  -exec grep -HF '' {} \; | \
-  sed '
-    s,^.*/,,
-    s/\.\([^.]\+\)\.\([^.]\+\)\.\([^.:]\+\)\.build-depends:\([^:]\+\)$/ \1 \2 \3 \4/
-  ' | \
+{
+  cat "${tmp_dir}/build-dependencies.mysql"
+  find "${work_dir}/package-infos" -name '*.build-depends' \
+    -exec grep -HF '' {} \; | \
+    sed '
+      s,^.*/,,
+      s/\.\([^.]\+\)\.\([^.]\+\)\.\([^.:]\+\)\.build-depends:\([^:]\+\)$/ \1 \2 \3 \4/
+    '
+} | \
   sort -u > \
   "${tmp_dir}/build-dependencies.file"