From 69a4e0c876772e4cc2a670de22890d35b7ceedb9 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Mon, 14 Jan 2013 01:11:08 +0000 Subject: Ignore version for new breakgae detection --- autobuild/results.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/autobuild/results.php b/autobuild/results.php index 8c8c3c6..f86db10 100644 --- a/autobuild/results.php +++ b/autobuild/results.php @@ -41,7 +41,7 @@ if ($prev) { $status_file = fopen($status_name, "r"); while (!feof($status_file)) { $line = fgets($status_file); - if (preg_match("/^(.*): (.*)$/", $line, $matches)) { + if (preg_match("/^(.*)-[^-]*-[^-]*mga[1-9].src.rpm: (.*)$/", $line, $matches)) { $rpm = $matches[1]; $status = $matches[2]; if ($status != "ok" && $status != "unknown" && $status != "not_on_this_arch") { @@ -56,6 +56,7 @@ $success = Array(); $failure = Array(); $fixed = Array(); $removed = Array(); +$broken = Array(); $base_dir = "cauldron/x86_64/core/$run"; @@ -81,6 +82,8 @@ while (!feof($status_file)) { $removed[$rpm] = 1; } elseif ($packages[$matches[1]] > $matches[2]) { $fixed[$rpm] = 1; + } elseif ($prev_failure[$matches[1]] != 1) { + $broken[$rpm] = 1; } } } @@ -124,7 +127,7 @@ foreach ($failure as $rpm => $error) { $status_html = " "; } elseif ($removed[$rpm]) { $status_html = " "; - } elseif ($prev && !$prev_failure[$rpm]) { + } elseif ($broken[$rpm]) { $status_html = " "; } $error_html = $error; -- cgit v1.2.1