summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/bootstrap-mysql2
-rw-r--r--misc/database-layout.dump2
2 files changed, 3 insertions, 1 deletions
diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index 2c63b2a..636ee60 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -272,6 +272,8 @@ fi
printf ' ON `replaced_bpir`.`replaced_by`=`moveable_bpir`.`id`'
printf ' JOIN `binary_packages_in_repositories` AS `repl_bpir`'
printf ' ON `repl_bpir`.`id`=`replaced_bpir`.`id`'
+ # deliberately break to-be-deleted packages
+ printf ' AND NOT `repl_bpir`.`is_to_be_deleted`'
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_with_versions
diff --git a/misc/database-layout.dump b/misc/database-layout.dump
index 4d81e5c..97407b2 100644
--- a/misc/database-layout.dump
+++ b/misc/database-layout.dump
@@ -190,7 +190,7 @@ DELETE `replaced_bpir`,`moveable_bpir`
JOIN `moveable_bpir`
ON `replaced_bpir`.`replaced_by`=`moveable_bpir`.`id`
JOIN `binary_packages_in_repositories` AS `repl_bpir`
- ON `repl_bpir`.`id`=`replaced_bpir`.`id`
+ ON `repl_bpir`.`id`=`replaced_bpir`.`id` AND NOT `repl_bpir`.`is_to_be_deleted`
JOIN `install_target_providers`
ON `repl_bpir`.`package`=`install_target_providers`.`package`
JOIN `repositories` AS `repl_r`