summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2013-01-14 01:11:08 +0000
committerPascal Terjan <pterjan@mageia.org>2013-01-14 01:11:08 +0000
commit69a4e0c876772e4cc2a670de22890d35b7ceedb9 (patch)
tree64ee164a9a180439fabdcbc4fc6baf8fcc360dd6
parent11c75b72a307722076918bd1f45fbf1d9b1ab2c1 (diff)
downloadpkgsubmit-69a4e0c876772e4cc2a670de22890d35b7ceedb9.tar
pkgsubmit-69a4e0c876772e4cc2a670de22890d35b7ceedb9.tar.gz
pkgsubmit-69a4e0c876772e4cc2a670de22890d35b7ceedb9.tar.bz2
pkgsubmit-69a4e0c876772e4cc2a670de22890d35b7ceedb9.tar.xz
pkgsubmit-69a4e0c876772e4cc2a670de22890d35b7ceedb9.zip
Ignore version for new breakgae detection
-rw-r--r--autobuild/results.php7
1 files 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 = " <img src='icons/state-fixed.png' title='Fixed!' />";
} elseif ($removed[$rpm]) {
$status_html = " <img src='icons/state-removed.png' title='Removed' />";
- } elseif ($prev && !$prev_failure[$rpm]) {
+ } elseif ($broken[$rpm]) {
$status_html = " <img src='icons/state-new.png' title='New!' />";
}
$error_html = $error;