diff options
| author | Erich Eckner <git@eckner.net> | 2018-07-23 15:06:31 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-07-23 15:06:31 +0200 |
| commit | 96773fdedcae8354aa720c63fb289140d482529d (patch) | |
| tree | baa606aae5fb7abd22c42815d35e8053c942ba1a /bin/get-package-updates | |
| parent | 4726ed62362267d10ea571da4f7ab75b0859b78d (diff) | |
| download | builder-96773fdedcae8354aa720c63fb289140d482529d.tar.xz | |
do not address deletion-list directly, but rather by its stability "forbidden"
Diffstat (limited to 'bin/get-package-updates')
| -rwxr-xr-x | bin/get-package-updates | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/bin/get-package-updates b/bin/get-package-updates index 1c0ac5e..575a96e 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -121,10 +121,15 @@ delete_package() { mysql_join_binary_packages_in_repositories_binary_packages mysql_join_binary_packages_build_assignments mysql_join_build_assignments_package_sources - printf ' SET ' + mysql_join_binary_packages_in_repositories_repositories + printf ' JOIN `repositories` AS `d_r`' # shellcheck disable=SC2154 + printf ' ON `d_r`.`stability`=%s' \ + "${repository_stability_ids__forbidden}" + printf ' AND `d_r`.`architecture`=`repositories`.`architecture`' + printf ' SET ' printf '`binary_packages_in_repositories`.`%s`=%s,' \ - 'repository' "${repository_ids__any_deletion_list}" \ + 'repository' '`d_r`.`id`' \ 'is_to_be_deleted' '1' \ 'last_moved' 'NOW()' | \ sed 's/,$//' @@ -379,14 +384,16 @@ trigger_rebuild_on_any_file_sed_expression=$( mysql_join_binary_packages_build_assignments mysql_join_build_assignments_package_sources mysql_join_binary_packages_binary_packages_in_repositories + mysql_join_binary_packages_in_repositories_repositories printf ' WHERE `package_sources`.`pkgbase`=from_base64("%s")' \ "$( printf '%s' "${package}" | \ base64 -w0 )" - printf ' AND `binary_packages_in_repositories`.`repository` IN (%s,%s);\n' \ - "${repository_ids__any_build_list}" \ - "${repository_ids__any_deletion_list}" + # shellcheck disable=SC2154 + printf ' AND `repositories`.`stability` IN (%s,%s);\n' \ + "${repository_stability_ids__unbuilt}" \ + "${repository_stability_ids__forbidden}" # remove is-to-be-deleted marker from old binary packages printf 'UPDATE `binary_packages_in_repositories`' mysql_join_binary_packages_in_repositories_binary_packages |