Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildmaster/blacklist.php40
1 files changed, 27 insertions, 13 deletions
diff --git a/buildmaster/blacklist.php b/buildmaster/blacklist.php
index 24247e8..b76ec88 100644
--- a/buildmaster/blacklist.php
+++ b/buildmaster/blacklist.php
@@ -4,16 +4,30 @@ require_once "../init.php";
require_once BASE . "/lib/mysql.php";
$result = mysql_run_query(
- "SELECT DISTINCT" .
- " GROUP_CONCAT(`architectures`.`name`) AS `architectures`," .
- "`package_sources`.`pkgbase`," .
- "`build_assignments`.`is_black_listed` " .
- "FROM `build_assignments` " .
- mysql_join_build_assignments_architectures() .
- mysql_join_build_assignments_package_sources() .
- "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`"
+ 'SELECT DISTINCT' .
+ ' GROUP_CONCAT(`q`.`arch`) AS `archs`,' .
+ '`q`.`pkgbases`,' .
+ '`q`.`reason`' .
+ ' FROM (' .
+ 'SELECT DISTINCT' .
+ ' `q`.`arch`,' .
+ 'GROUP_CONCAT(`q`.`pkgbase`) AS `pkgbases`,' .
+ '`q`.`reason`' .
+ ' FROM (' .
+ 'SELECT DISTINCT' .
+ ' `architectures`.`name` AS `arch`,' .
+ '`package_sources`.`pkgbase`,' .
+ '`build_assignments`.`is_black_listed` AS `reason`' .
+ ' FROM `build_assignments`' .
+ mysql_join_build_assignments_architectures() .
+ mysql_join_build_assignments_package_sources() .
+ 'WHERE `build_assignments`.`is_black_listed` IS NOT NULL' .
+ ' ORDER BY `package_sources`.`pkgbase`' .
+ ') AS `q`' .
+ ' GROUP BY CONCAT(to_base64(`q`.`arch`)," - ",to_base64(`q`.`reason`))' .
+ ' ORDER BY `q`.`arch`' .
+ ') AS `q`' .
+ ' GROUP BY CONCAT(to_base64(`q`.`pkgbases`)," - ",to_base64(`q`.`reason`))'
);
?>
@@ -36,10 +50,10 @@ if ($result -> num_rows > 0) {
while($row = $result->fetch_assoc()) {
print " <tr>\n";
print " <td>";
- print $row["architectures"];
+ print $row['archs'];
print "</td>\n";
print " <td>";
- print $row["pkgbase"];
+ print $row['pkgbases'];
print "</td>\n";
print " <td>";
print preg_replace(
@@ -51,7 +65,7 @@ if ($result -> num_rows > 0) {
"<a href=\"https://bugs.archlinux32.org/index.php?do=details&task_id=$1\">$0</a>",
"<a href=\"https://bugs.archlinux.org/task/$1\">$0</a>"
),
- $row["is_black_listed"]
+ $row['reason']
);
print "</td>\n";
print " </tr>\n";