diff options
| -rwxr-xr-x | bin/get-package-updates | 6 | ||||
| -rwxr-xr-x | bin/seed-build-list | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/bin/get-package-updates b/bin/get-package-updates index 94f58cb..02d689b 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -599,8 +599,6 @@ echo 'Done - mark decisions as final.' "${repository_ids__any_build_list}" printf ' WHERE `binary_packages_in_repositories`.`repository`=%s;\n' \ "${repository_ids__any_to_be_decided}" - # remove duplicate binary_packages from "build-list" - mysql_query_remove_old_binary_packages_from_build_list } | \ mysql_run_query @@ -610,6 +608,10 @@ mysql_sort_versions # not "to-be-decided", so we need to run this after moving the packages from "to-be-decided" to the "build-list". mysql_find_build_assignment_loops +# remove duplicate binary_packages from "build-list" +mysql_query_remove_old_binary_packages_from_build_list | \ + mysql_run_query + # Remove the lock file rm -f "${build_list_lock_file}" diff --git a/bin/seed-build-list b/bin/seed-build-list index d00b2ee..83ba460 100755 --- a/bin/seed-build-list +++ b/bin/seed-build-list @@ -591,9 +591,6 @@ if ${update}; then mysql_join_binary_packages_binary_packages_in_repositories 'a_bp' 'a_bpir' printf ' AND `a_bpir`.`repository`=%s;\n' \ "${repository_ids__any_build_list}" - - # remove duplicate binary_packages from "build-list" - mysql_query_remove_old_binary_packages_from_build_list } | \ mysql_run_query @@ -601,6 +598,10 @@ if ${update}; then mysql_sort_versions + # remove duplicate binary_packages from "build-list" + mysql_query_remove_old_binary_packages_from_build_list | \ + mysql_run_query + rm -f "${build_list_lock_file}" else cat "${tmp_dir}/update-list" |