summaryrefslogtreecommitdiff
path: root/buildmaster
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-10-04 08:43:46 +0200
committerErich Eckner <git@eckner.net>2018-10-04 08:43:46 +0200
commit80507b6704340bf08e17db567298fd6a3975fe89 (patch)
tree9a16a886ee855b1409180441074262728e27e665 /buildmaster
parentbcf6609cda6fe309891c9cd6ecd3e7f36505c11b (diff)
downloadwebsite-80507b6704340bf08e17db567298fd6a3975fe89.tar.xz
buildmaster/blacklist.php: group_concat architectures
Diffstat (limited to 'buildmaster')
-rw-r--r--buildmaster/blacklist.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/buildmaster/blacklist.php b/buildmaster/blacklist.php
index 07ac85a..acd59e9 100644
--- a/buildmaster/blacklist.php
+++ b/buildmaster/blacklist.php
@@ -4,11 +4,15 @@ require_once "../init.php";
require_once BASE . "/lib/mysql.php";
$result = mysql_run_query(
- "SELECT DISTINCT `architectures`.`name` AS `architecture`,`package_sources`.`pkgbase`,`build_assignments`.`is_black_listed` " .
+ "SELECT DISTINCT" .
+ " GROUP_CONCAT(`architectures`.`name`) AS `architectures`," .
+ "`package_sources`.`pkgbase`," .
+ "`build_assignments`.`is_black_listed` " .
"FROM `build_assignments` " .
"JOIN `architectures` ON `build_assignments`.`architecture`=`architectures`.`id` " .
"JOIN `package_sources` ON `build_assignments`.`package_source`=`package_sources`.`id` " .
"WHERE `build_assignments`.`is_black_listed` IS NOT NULL " .
+ "GROUP BY CONCAT(to_base64(`package_sources`.`pkgbase`),\" - \",to_base64(`build_assignments`.`is_black_listed`)) " .
"ORDER BY `package_sources`.`pkgbase`"
);
@@ -22,7 +26,7 @@ require_once BASE . "/lib/mysql.php";
<?php show_warning_on_offline_slave(); ?>
<table>
<tr>
- <th>architecture</th>
+ <th>architectures</th>
<th>package</th>
<th>reason</th>
</tr>
@@ -32,7 +36,7 @@ if ($result -> num_rows > 0) {
while($row = $result->fetch_assoc()) {
print " <tr>\n";
print " <td>";
- print $row["architecture"];
+ print $row["architectures"];
print "</td>\n";
print " <td>";
print $row["pkgbase"];