From 2963f6e20bddb2110509994b7b49599bcb5096f1 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 17 Jan 2019 16:23:09 +0100 Subject: bin/bootstrap-mysql: several checks by `repository_stability_relations` were lacking the check for equal architectures of the repositories --- bin/bootstrap-mysql | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bin/bootstrap-mysql') diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql index 98ae6b3..43a5bc5 100755 --- a/bin/bootstrap-mysql +++ b/bin/bootstrap-mysql @@ -208,6 +208,11 @@ fi printf ' ON `prov_r`.`stability`=`repository_stability_relations`.`more_stable`' printf ' WHERE `install_target_providers`.`install_target`=`dependencies`.`depending_on`' printf ' AND `target_repositories`.`stability`=`repository_stability_relations`.`less_stable`' + printf ' AND `target_repositories`.`architecture`=`prov_r`.`architecture`' + # This assumes, the moved package which replaces the install-target-provider + # will not be deleted from the moveable list. Note, that there is no greedy + # way to find out wether that is the case or not - so we just assume, + # it stays on the list. printf ' AND NOT EXISTS (' printf 'SELECT 1' printf ' FROM `replaced_bpir_copy`' @@ -310,6 +315,7 @@ fi printf ' ON `subst_rr`.`more_stable`=`subst_r`.`stability`' # ... than x's repository ... printf ' WHERE `subst_rr`.`less_stable`=`repl_r`.`stability`' + printf ' AND `subst_r`.`architecture`=`repl_r`.`architecture`' # (architecture check is not necessary, as repositories of different # architectures are not less or more stable than each other) printf ' AND NOT EXISTS (' -- cgit v1.2.3