summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-15 10:35:46 +0100
committerErich Eckner <git@eckner.net>2019-01-15 10:35:46 +0100
commitfb849148290dc00b59235bd0525f37ffed806bb2 (patch)
treefbb58d4e52763a8da093fada4356236997068dd8
parent387117f5565decbda3ae802ec86431af398fd4fe (diff)
downloadbuilder-fb849148290dc00b59235bd0525f37ffed806bb2.tar.xz
bin/db-update -p: moved packages may replace packages in other repositories of same stability - check for that, too, when checking for packages that replace nothing when moved
-rwxr-xr-xbin/db-update6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/db-update b/bin/db-update
index 94c1ec6..4f7cfd3 100755
--- a/bin/db-update
+++ b/bin/db-update
@@ -276,11 +276,15 @@ for source_stability in \
mysql_join_package_sources_upstream_repositories
mysql_join_upstream_repositories_repository_moves
printf ' AND `repository_moves`.`from_repository`=`binary_packages_in_repositories`.`repository`'
+ printf ' JOIN `repositories` as `to_r`'
+ printf ' ON `to_r`.`id`=`repository_moves`.`to_repository`'
printf ' WHERE NOT EXISTS ('
printf 'SELECT 1 FROM `binary_packages_in_repositories` AS `repl_bpir`'
mysql_join_binary_packages_in_repositories_binary_packages 'repl_bpir' 'repl_bp'
+ mysql_join_binary_packages_in_repositories_repositories 'repl_bpir' 'repl_r'
printf ' WHERE `repl_bp`.`pkgname`=`binary_packages`.`pkgname`'
- printf ' AND `repl_bpir`.`repository`=`repository_moves`.`to_repository`'
+ printf ' AND `repl_r`.`stability`=`to_r`.`stability`'
+ printf ' AND `repl_r`.`architecture`=`to_r`.`architecture`'
printf ');\n'
else
printf 'CALL calculate_maximal_moveable_set(%s);\n' \