Merge branch 'master' into fixes

1 files changed, 15 insertions, 10 deletions

diff --git a/bin/build-master-status b/bin/build-master-status
index 9503d71..7ab38d4 100755
--- a/bin/build-master-status
+++ b/bin/build-master-status
@@ -19,7 +19,7 @@ fi
 mysql_cleanup
 
 # update todos
-find "${base_dir}/bin/" "${base_dir}/conf/" -type f \
+find "${base_dir}/bin/" "${base_dir}/conf/" "${base_dir}/lib/" -type f \
   -exec grep -nHF '' '{}' \; | \
   sed 's,^'"$(str_to_regex "${base_dir}")"'/,,' | \
   sed -n '
@@ -206,15 +206,20 @@ if [ ! -s "${work_dir}/build-master-sanity" ]; then
     mysql_join_build_assignments_binary_packages
     mysql_join_binary_packages_repositories
     printf ' WHERE `repositories`.`name`="build-list"'
-    printf ' AND NOT EXISTS ('
-      printf 'SELECT * FROM `dependencies`'
-      mysql_join_dependencies_dependency_types
-      printf ' AND `dependency_types`.`relevant_for_binary_packages`'
-      mysql_join_dependencies_install_target_providers
-      mysql_join_install_target_providers_binary_packages '' 'prov_bp'
-      mysql_join_binary_packages_repositories 'prov_bp' 'prov_r'
-      printf ' WHERE `prov_r`.`name`="build-list"'
-      printf ' AND `dependencies`.`dependent`=`binary_packages`.`id`'
+    printf ' AND ('
+      printf 'NOT EXISTS ('
+        printf 'SELECT 1 FROM `dependencies`'
+        mysql_join_dependencies_dependency_types
+        printf ' AND `dependency_types`.`relevant_for_building`'
+        mysql_join_dependencies_install_target_providers
+        mysql_join_install_target_providers_binary_packages '' 'prov_bp'
+        mysql_join_binary_packages_repositories 'prov_bp' 'prov_r'
+        printf ' WHERE `prov_r`.`name`="build-list"'
+        printf ' AND `dependencies`.`dependent`=`binary_packages`.`id`'
+      printf ') OR EXISTS ('
+        printf 'SELECT 1 FROM `build_dependency_loops`'
+        printf ' WHERE `build_dependency_loops`.`build_assignment`=`build_assignments`.`id`'
+      printf ')'
     printf '))'
     printf ');\n'
   } | \