From 80507b6704340bf08e17db567298fd6a3975fe89 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 4 Oct 2018 08:43:46 +0200
Subject: buildmaster/blacklist.php: group_concat architectures

---
 buildmaster/blacklist.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'buildmaster')

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"];
-- 
cgit v1.2.3