From fda3aa597e40493381fa2aeefe5a2bdc68f28521 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 23 May 2023 10:25:00 +0200 Subject: do not remove deletion-marker for all scheduled pkgbases * we should additionally match the target repository * else, a moved package will be ** marked for deletion in the old repository ** scheduled to be built in the new repository ** unmarked for deletion in *both* repositories ** only the next run will mark it for deletion again --- bin/get-package-updates | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/get-package-updates b/bin/get-package-updates index 7d1aff2..4d2a8f9 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -439,12 +439,18 @@ while read -r pkgbase repository git_revision mod_git_revision; do mysql_join_binary_packages_in_repositories_binary_packages mysql_join_binary_packages_build_assignments mysql_join_build_assignments_package_sources + mysql_join_package_sources_upstream_repositories printf ' SET `binary_packages_in_repositories`.`is_to_be_deleted`=0' - printf ' WHERE `package_sources`.`pkgbase`=from_base64("%s");\n' \ + printf ' WHERE `package_sources`.`pkgbase`=from_base64("%s")' \ "$( printf '%s' "${pkgbase}" \ | base64 -w0 )" + printf ' AND `upstream_repositories`.`name`=from_base64("%s");\n' \ + "$( + printf '%s' "${repository}" \ + | base64 -w0 + )" } \ | mysql_run_query # shellcheck disable=SC2154 -- cgit v1.2.3-54-g00ecf