From 156df01c61ba56b005cff6777eb562a010f2a4c2 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 8 Nov 2018 11:01:53 +0100 Subject: packages/pkginfo.php: dependencies and dependent packages must be in repositories of the same architecture --- packages/pkginfo.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'packages/pkginfo.php') diff --git a/packages/pkginfo.php b/packages/pkginfo.php index f00dded..b283b17 100644 --- a/packages/pkginfo.php +++ b/packages/pkginfo.php @@ -120,6 +120,10 @@ require_once BASE . "/lib/style.php"; ") AS `version`," . "`install_targets`.`name` AS `install_target`" . " FROM `dependencies`" . + " LEFT JOIN (". + "`binary_packages_in_repositories` AS `bpir`" . + " JOIN `repositories` AS `r` ON `r`.`id`=`bpir`.`repository`" . + ") ON `bpir`.`package`=`dependencies`.`dependent`" . " JOIN `dependency_types` ON `dependency_types`.`id`=`dependencies`.`dependency_type`" . " JOIN `install_targets` ON `install_targets`.`id`=`dependencies`.`depending_on`" . " AND `install_targets`.`name` NOT IN (\"base\",\"base-devel\")" . @@ -133,6 +137,7 @@ require_once BASE . "/lib/style.php"; " JOIN `repository_stability_relations` ON `repository_stability_relations`.`more_stable`=`repositories`.`stability`" . " AND `repository_stability_relations`.`less_stable`=" . $mysql_content["repo_stability"] . ") ON `install_target_providers`.`install_target`=`dependencies`.`depending_on`" . + " AND `repositories`.`architecture`=`r`.`architecture`" . " WHERE `dependencies`.`dependent`=" . $mysql_content["id"] . " AND NOT EXISTS (" . "SELECT 1 FROM `binary_packages` AS `subst_bp`" . @@ -212,6 +217,10 @@ require_once BASE . "/lib/style.php"; "`binary_packages`.`pkgname`," . "IF(`binary_packages_in_repositories`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`" . " FROM `install_target_providers`" . + " LEFT JOIN (". + "`binary_packages_in_repositories` AS `bpir`" . + " JOIN `repositories` AS `r` ON `r`.`id`=`bpir`.`repository`" . + ") ON `bpir`.`package`=`install_target_providers`.`package`" . " JOIN `install_targets` ON `install_targets`.`id`=`install_target_providers`.`install_target`" . " AND `install_targets`.`name` NOT IN (\"base\",\"base-devel\")" . " JOIN `dependencies` ON `install_target_providers`.`install_target`=`dependencies`.`depending_on`" . @@ -220,6 +229,7 @@ require_once BASE . "/lib/style.php"; " JOIN `architectures` ON `binary_packages`.`architecture`=`architectures`.`id`" . " JOIN `binary_packages_in_repositories` ON `binary_packages`.`id`=`binary_packages_in_repositories`.`package`" . " JOIN `repositories` ON `binary_packages_in_repositories`.`repository`=`repositories`.`id`" . + " AND `repositories`.`architecture`=`r`.`architecture`" . " JOIN `repository_stability_relations` ON `repository_stability_relations`.`less_stable`=`repositories`.`stability`" . " AND `repository_stability_relations`.`more_stable`=" . $mysql_content["repo_stability"] . " WHERE `install_target_providers`.`package`=" . $mysql_content["id"] . -- cgit v1.2.3-70-g09d2