Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-11-08 11:01:53 +0100
committerErich Eckner <git@eckner.net>2018-11-08 11:01:53 +0100
commit156df01c61ba56b005cff6777eb562a010f2a4c2 (patch)
treeb463e6b43c73b0d000fa9ed76c1a3cb60584531e
parent778dfd0c1a8fbc015d0b944e053fb2d7135d49c7 (diff)
packages/pkginfo.php: dependencies and dependent packages must be in repositories of the same architecture
-rw-r--r--packages/pkginfo.php10
1 files changed, 10 insertions, 0 deletions
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"] .