bin/bootstrap-mysql: do not actually replace packages that are only being hidden

1 files changed, 27 insertions, 1 deletions

diff --git a/misc/database-layout.dump b/misc/database-layout.dump
index 46f4814..c1d8dd1 100644
--- a/misc/database-layout.dump
+++ b/misc/database-layout.dump
@@ -115,7 +115,7 @@ SELECT 1
 	JOIN `binary_packages` AS `sup_bp`
 	ON `sup_bpir`.`package`=`sup_bp`.`id`
 	JOIN `repositories` AS `sup_r`
-	ON `sup_bp`.`repository`=`sup_r`.`id`
+	ON `sup_bpir`.`repository`=`sup_r`.`id`
 	JOIN `repository_stability_relations` AS `rsr_b`
 	ON `rsr_b`.`less_stable`=`sup_r`.`stability`
 	WHERE `sup_bp`.`pkgname`=`m_bp`.`pkgname` AND `sup_r`.`architecture`=`m_to_r`.`architecture` AND `rsr_b`.`more_stable`=`r_r`.`stability`);
@@ -280,6 +280,32 @@ SELECT 1
 SET row_count_saved = row_count_saved + ROW_COUNT();
 UNTIL row_count_saved=0
 END REPEAT;
+DELETE
+	FROM `replaced_bpir_copy`;
+INSERT IGNORE INTO `replaced_bpir_copy`
+	SELECT `replaced_bpir`.*
+	FROM `replaced_bpir`;
+DELETE
+	FROM `replaced_bpir_copy2`;
+INSERT IGNORE INTO `replaced_bpir_copy2`
+	SELECT `replaced_bpir`.*
+	FROM `replaced_bpir`;
+DELETE
+	FROM `moveable_bpir_copy`;
+INSERT IGNORE INTO `moveable_bpir_copy`
+	SELECT `moveable_bpir`.*
+	FROM `moveable_bpir`;
+DELETE `replaced_bpir`
+	FROM `replaced_bpir`
+	JOIN `moveable_bpir`
+	ON `replaced_bpir`.`replaced_by`=`moveable_bpir`.`id`
+	JOIN `binary_packages_in_repositories` AS `r_bpir`
+	ON `replaced_bpir`.`id`=`r_bpir`.`id`
+	JOIN `repositories` AS `r_r`
+	ON `r_bpir`.`repository`=`r_r`.`id`
+	JOIN `repositories` AS `m_to_r`
+	ON `m_to_r`.`id`=`moveable_bpir`.`to_repository`
+	WHERE `m_to_r`.`stability`!=`r_r`.`stability`;
 DROP TEMPORARY TABLE `moveable_bpir_copy`;
 DROP TEMPORARY TABLE `replaced_bpir_copy`;
 DROP TEMPORARY TABLE `replaced_bpir_copy2`;