From adbb9bb90fe4841dbb0c14c11c283e9f5bef05e2 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 15 May 2019 13:22:39 +0200 Subject: bin/get-package-updates: make rescheduling logic apply to our sources, too --- bin/get-package-updates | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'bin/get-package-updates') diff --git a/bin/get-package-updates b/bin/get-package-updates index ceab21a..a254c7b 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -299,13 +299,12 @@ echo 'Check modified packages from the last update, and put them to the build li # If a package is deleted, remove from the rebuild list, and add it to the deletion list. # If a new package is added, then ensure that it's not on the deletion list. -# note: This only works for upstream sources! # shellcheck disable=SC2016 { - printf 'SELECT DISTINCT CONCAT(' - printf '`package_sources`.`pkgbase`,"/repos/",' - printf '`upstream_repositories`.`name`,"-",' - printf 'IF(`build_assignments`.`architecture`=%s,"any","x86_64"))' \ + printf 'SELECT DISTINCT' + printf ' `package_sources`.`pkgbase`,' + printf '`upstream_repositories`.`name`,' + printf 'IF(`build_assignments`.`architecture`=%s,"any","x86_64")' \ "${architecture_ids__any}" printf ' FROM `binary_packages`' mysql_join_binary_packages_binary_packages_in_repositories @@ -317,7 +316,7 @@ echo 'Check modified packages from the last update, and put them to the build li } | \ mysql_run_query | \ sed ' - s@.*@s,^\\(.\\t\0/\\)[^/]\\+,\\1PKGBUILD,@ + s@^\(\S*\)\t\(\S*\)\t\(\S*\)$@s,^\\(.\\t\1/repos/\2-\3/\\)[^/]\\+$,\\1PKGBUILD,\ns,^\\(.\\t\2/\1/\\)[^/]\\+$,\\1PKGBUILD,@ ' > \ "${tmp_dir}/trigger-rebuild-on-any-file-sed-expression" -- cgit v1.2.3