diff options
| author | Erich Eckner <git@eckner.net> | 2018-10-29 16:16:44 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-10-29 16:16:44 +0100 |
| commit | f52e97f1ad907f8406f6b1f53e6f82394fca2a84 (patch) | |
| tree | 6618ac2e2adc92946853f08ce7c94a47445fdac6 /buildmaster | |
| parent | f175baf39675a72426d63b620d968eeaa44648b2 (diff) | |
| download | archweb32-f52e97f1ad907f8406f6b1f53e6f82394fca2a84.tar.xz | |
buildmaster/mysql-issues.php: correctly handle architecture
Diffstat (limited to 'buildmaster')
| -rw-r--r-- | buildmaster/mysql-issues.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/buildmaster/mysql-issues.php b/buildmaster/mysql-issues.php index 0604167..33ae438 100644 --- a/buildmaster/mysql-issues.php +++ b/buildmaster/mysql-issues.php @@ -2,10 +2,13 @@ require_once "../init.php"; require_once BASE . "/lib/mysql.php"; + $ignore = ""; + if (isset($_GET["ignore-haskell"])) - $ignore = " AND `install_targets`.`name` NOT LIKE \"libHS%\""; - else - $ignore = ""; + $ignore .= " AND `install_targets`.`name` NOT LIKE \"libHS%\""; + + if (isset($_GET["ignore-i486"])) + $ignore .= " AND `r_a`.`name` != \"i486\""; $result = mysql_run_query( "SELECT CONCAT(" . @@ -96,6 +99,7 @@ require_once BASE . "/lib/mysql.php"; " JOIN `repository_stability_relations` ON `prov_r`.`stability`=`repository_stability_relations`.`more_stable`" . " WHERE `install_target_providers`.`install_target` = `dependencies`.`depending_on`" . " AND `repositories`.`stability`=`repository_stability_relations`.`less_stable`" . + " AND `repositories`.`architecture`=`prov_r`.`architecture`" . " AND NOT EXISTS (" . "SELECT 1 FROM `binary_packages` AS `sup_bp`" . " JOIN `binary_packages_in_repositories` AS `sup_bpir` ON `sup_bp`.`id`=`sup_bpir`.`package`" . @@ -107,6 +111,7 @@ require_once BASE . "/lib/mysql.php"; " AND `sup_bp`.`id` != `prov_bp`.`id`" . " AND `repositories`.`stability`=`sup_rra`.`less_stable`" . " AND `prov_r`.`stability`=`sup_rrb`.`more_stable`" . + " AND `prov_r`.`architecture`=`sup_r`.`architecture`" . ")" . ")" . $ignore . |