Permalink
Browse files

List detected file collisions as build failure _and_ separately.

  • Loading branch information...
1 parent c2af00a commit 5d0e23d68316c149bafa0d8589057b8f200c7e58 @Flameeyes Flameeyes committed Jul 16, 2012
Showing with 10 additions and 1 deletion.
  1. +1 −0 display.rb
  2. +6 −1 readscript.rb
  3. +3 −0 views/index.erb
View
@@ -45,6 +45,7 @@
((data.attributes["test_failed"][0] == "true" rescue false) ? 1 : 0),
:pkg_failed => (data.attributes["pkg_failed"][0] == "true" rescue false),
:test_failed => (data.attributes["test_failed"][0] == "true" rescue false),
+ :collision => (data.attributes["collision"][0] == "true" rescue false),
:bug_template => {
:assigned_to => (data.attributes["bug_assignee"][0] rescue "bug-wranglers@gentoo.org"),
:cc => (data.attributes["bug_cc"][0] rescue ""),
View
@@ -90,9 +90,13 @@
elsif line =~ /^ \* ERROR: .* failed \(test phase\):/
test_failed = true
match = true
- elsif line =~ /(^ \* ERROR: .* failed|detected file collision)/
+ elsif line =~ /^ \* ERROR: .* failed/
pkg_failed = true
match = true
+ elsif line =~ /Detected file collision/
+ pkg_failed = true
+ collision = true
+ match = true
elsif line =~ /^ \* Maintainer: ([a-zA-Z0-9.@_+-]+)(?: ([a-zA-Z0-9.@_+,-]+))?$/
bug_assignee = $1
bug_cc = $2
@@ -128,6 +132,7 @@
:matches => matches,
:pkg_failed => pkg_failed,
:test_failed => test_failed,
+ :collision => collision,
:public_url => html_log.public_url,
:bug_assignee => bug_assignee,
:bug_cc => bug_cc);
View
@@ -31,6 +31,9 @@
<% if item[:pkg_failed] %>
<img src="wrench.png" width="16px" height="16px" alt="[BF]" />
<% end %>
+ <% if item[:pkg_failed] %>
+ [C]
+ <% end %>
</td>
</tr>
<% end %>

0 comments on commit 5d0e23d

Please sign in to comment.