summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-04 15:16:01 +0200
committerErich Eckner <git@eckner.net>2018-09-04 15:16:01 +0200
commitc32924e6f226f1e961b0cf3576c04c639e1637bb (patch)
tree4c1850049d51942555669234f07ebdfedf9391a7 /bin
parent122575e94563705ec0b7227fb6afbd53f5244405 (diff)
downloadbuilder-c32924e6f226f1e961b0cf3576c04c639e1637bb.tar.xz
mysql_join_dependencies_install_target_providers_with_versions() and mysql_join_install_target_providers_dependencies_with_versions() new - do not ignore the stored versions!
Diffstat (limited to 'bin')
-rwxr-xr-xbin/bootstrap-mysql2
-rwxr-xr-xbin/build-master-status2
-rwxr-xr-xbin/seed-build-list4
-rwxr-xr-xbin/why-dont-you2
4 files changed, 5 insertions, 5 deletions
diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index 68a90ff..f130a9a 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -233,7 +233,7 @@ fi
printf ' JOIN `binary_packages_in_repositories` AS `repl_bpir` ON `repl_bpir`.`id`=`replaced_bpir`.`id`'
mysql_join_binary_packages_in_repositories_install_target_providers 'repl_bpir'
mysql_join_binary_packages_in_repositories_repositories 'repl_bpir' 'repl_r'
- mysql_join_install_target_providers_dependencies
+ mysql_join_install_target_providers_dependencies_with_versions
printf ' AND NOT EXISTS ('
# dependencies of replaced packages don't matter
printf 'SELECT 1 FROM `replaced_bpir_copy`'
diff --git a/bin/build-master-status b/bin/build-master-status
index 369b792..5786fb8 100755
--- a/bin/build-master-status
+++ b/bin/build-master-status
@@ -232,7 +232,7 @@ if [ ! -s "${work_dir}/build-master-sanity" ]; then
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_dependencies_install_target_providers_with_versions
mysql_join_install_target_providers_binary_packages '' 'prov_bp'
mysql_join_binary_packages_binary_packages_in_repositories 'prov_bp' 'prov_bpir'
printf ' WHERE `prov_bpir`.`repository`=%s' \
diff --git a/bin/seed-build-list b/bin/seed-build-list
index 0e8c425..a96b822 100755
--- a/bin/seed-build-list
+++ b/bin/seed-build-list
@@ -344,7 +344,7 @@ fi
mysql_join_binary_packages_dependencies
mysql_join_dependencies_dependency_types
printf ' AND `dependency_types`.`relevant_for_binary_packages`'
- mysql_join_dependencies_install_target_providers '' 'itp_dummy'
+ mysql_join_dependencies_install_target_providers_with_versions '' 'itp_dummy'
# some dependencies are not provided by the least stable packages
printf ' WHERE NOT EXISTS ('
printf 'SELECT 1 FROM `install_target_providers`'
@@ -484,7 +484,7 @@ fi
printf '`dependency_types`.`relevant_for_building`'
printf ' OR `dependency_types`.`relevant_for_binary_packages`'
printf ')'
- mysql_join_dependencies_install_target_providers '' 'it_dummy'
+ mysql_join_dependencies_install_target_providers_with_versions '' 'it_dummy'
printf ' WHERE `dependencies`.`dependent`=`binary_packages`.`id`'
printf ' AND NOT EXISTS ('
printf 'SELECT 1 FROM `install_target_providers`'
diff --git a/bin/why-dont-you b/bin/why-dont-you
index 2ea27ab..5c6e08a 100755
--- a/bin/why-dont-you
+++ b/bin/why-dont-you
@@ -80,7 +80,7 @@ case "${action}" in
# now we have some (=3) additional joins,
# because we are interested in dependency relations to `to_build`
mysql_join_binary_packages_install_target_providers 'dep_bin'
- mysql_join_install_target_providers_dependencies
+ mysql_join_install_target_providers_dependencies_with_versions
mysql_join_dependencies_dependency_types
printf ' WHERE `dep_rep`.`name`="build-list"'
printf ' AND `dependency_types`.`relevant_for_building`'