Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-02-07 21:44:08 +0100
committerErich Eckner <git@eckner.net>2018-02-07 21:44:08 +0100
commit9ec11f6a3948a1840dc25f7186d688e6634096ea (patch)
tree2dee38b995082631da759ab890c89e45c1033e47
parent62526023ab4bb6dda4e8189ca74969497bb3ef09 (diff)
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)
-rwxr-xr-xbin/build-master-status-from-mysql15
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"