[Collab-qa-commits] r2677 - in collab-qa-tools: bin lib/collab-qa

[Lucas Nussbaum]

Author: lucas
Date: 2013-05-12 08:38:37 +0000 (Sun, 12 May 2013)
New Revision: 2677

Modified:
   collab-qa-tools/bin/cqa-annotate
   collab-qa-tools/lib/collab-qa/log-parser-build.rb
   collab-qa-tools/lib/collab-qa/log-parser-instest.rb
   collab-qa-tools/lib/collab-qa/log-parser.rb
Log:
some fixes

Modified: collab-qa-tools/bin/cqa-annotate
===================================================================
--- collab-qa-tools/bin/cqa-annotate	2013-05-12 00:00:47 UTC (rev 2676)
+++ collab-qa-tools/bin/cqa-annotate	2013-05-12 08:38:37 UTC (rev 2677)
@@ -86,6 +86,12 @@
         f.print todo
       end
       ex = true
+    elsif l =~ /^v /
+      rest, b = l.split(' ')
+      if b.to_i != 0
+        bugnum = bugs[b.to_i-1].split[0]
+        system("w3m -dump http://bugs.debian.org/#{bugnum}")
+      end
     elsif l =~ /^sev /
       rest, b = l.split(' ')
       if b.to_i != 0

Modified: collab-qa-tools/lib/collab-qa/log-parser-build.rb
===================================================================
--- collab-qa-tools/lib/collab-qa/log-parser-build.rb	2013-05-12 00:00:47 UTC (rev 2676)
+++ collab-qa-tools/lib/collab-qa/log-parser-build.rb	2013-05-12 08:38:37 UTC (rev 2677)
@@ -184,16 +184,17 @@
 
       @sum_1l = 'DEPS'
       if (b = @extract.index('The following packages have unmet dependencies:'))
-        e = @extract.index('E: Broken packages') || @extract.index('E: Unable to correct problems, you have held broken packages.')
+        e = @extract.index('E: Broken packages') || @extract.index('E: Unable to correct problems, you have held broken packages.') || @extract.index('apt-get failed.')
         if e - b == 2 # only one line
           l = @extract[b+1]
-          if l =~ /^ sbuild-build-depends-#{pkg}-dummy : Depends: (.*) but it is not installable$/
+          pkge = Regexp::escape(pkg)
+          if l =~ /^ sbuild-build-depends-#{pkge}-dummy : Depends: (.*) but it is not installable$/
             @sum_1l = "build-dependency not installable: #{$1}"
-          elsif l =~ /^ sbuild-build-depends-#{pkg}-dummy : Depends: (.* but .* is to be installed)$/
+          elsif l =~ /^ sbuild-build-depends-#{pkge}-dummy : Depends: (.* but .* is to be installed)$/
             @sum_1l = "unsatisfiable build-dependency: #{$1}"
-          elsif l =~ /^ sbuild-build-depends-#{pkg}-dummy : Depends: (.*) but it is not going to be installed$/
+          elsif l =~ /^ sbuild-build-depends-#{pkge}-dummy : Depends: (.*) but it is not going to be installed$/
             @sum_1l = "build-dependency not installable: #{$1}"
-          elsif l =~ /^ sbuild-build-depends-#{pkg}-dummy : Depends: (.*)$/
+          elsif l =~ /^ sbuild-build-depends-#{pkge}-dummy : Depends: (.*)$/
             @sum_1l = "unsatisfiable build-dependency: #{$1} (versioned dep on a virtual pkg?)"
           end
         else # multi-line

Modified: collab-qa-tools/lib/collab-qa/log-parser-instest.rb
===================================================================
--- collab-qa-tools/lib/collab-qa/log-parser-instest.rb	2013-05-12 00:00:47 UTC (rev 2676)
+++ collab-qa-tools/lib/collab-qa/log-parser-instest.rb	2013-05-12 08:38:37 UTC (rev 2677)
@@ -66,10 +66,18 @@
         @sum_1l = "installation fails"
       elsif @reasons.include?('inst-aptitude')
         g1 = @lines.grep_index(/^-- Installing the package with aptitude: FAILED$/)[0]
+        if g1
+          lines = @lines[g1+1..-1]
+          g2 = lines.grep_index(/^-- /)[0]
+          @sum_ml = @extract = lines[0..g2-1]
+          @sum_1l = "installation fails with aptitude"
+       else
+        g1 = @lines.grep_index(/^-- Creating new chroot and installing aptitude: FAILED while installing aptitude$/)[0]
         lines = @lines[g1+1..-1]
         g2 = lines.grep_index(/^-- /)[0]
         @sum_ml = @extract = lines[0..g2-1]
-        @sum_1l = "installation fails with aptitude"
+        @sum_1l = "installation fails with aptitude (while installing aptitude)"
+       end
       elsif @reasons.include?('inst-with-recs')
         g1 = @lines.grep_index(/^-- Installing the package together with its depends and recommends: FAILED$/)[0]
         lines = @lines[g1+1..-1]

Modified: collab-qa-tools/lib/collab-qa/log-parser.rb
===================================================================
--- collab-qa-tools/lib/collab-qa/log-parser.rb	2013-05-12 00:00:47 UTC (rev 2676)
+++ collab-qa-tools/lib/collab-qa/log-parser.rb	2013-05-12 08:38:37 UTC (rev 2677)
@@ -304,7 +304,7 @@
 Source: #{@package}
 Version: #{@version}
 Severity: serious
-Tags: wheezy sid
+Tags: jessie sid
 User: debian-qa at lists.debian.org
 Usertags: qa-ftbfs-#{sdate} qa-ftbfs qa-ftbfs-buildarch
 Justification: FTBFS on amd64
@@ -327,7 +327,33 @@
 
 #{bfooter}
 EOF
+        elsif bugtype == 'wheezy'
+          s = <<-EOF
+From: #{fullname} <#{email}>
+To: submit at bugs.debian.org
+Subject: #{@package}: FTBFS: #{@sum_1l}
 
+Source: #{@package}
+Version: #{@version}
+Severity: serious
+Tags: wheezy sid
+User: debian-qa at lists.debian.org
+Usertags: qa-ftbfs-#{sdate} qa-ftbfs
+Justification: FTBFS in wheezy on amd64
+
+Hi,
+
+During a rebuild of all packages in *wheezy*, your package failed to
+build on amd64.
+
+Relevant part:
+> #{@extract.join("\n> ")}
+
+The full build log is available from:
+   http://people.debian.org/~lucas/logs/#{date}/#{filename}
+
+#{bfooter}
+EOF
         else
           s = <<-EOF
 From: #{fullname} <#{email}>
@@ -337,7 +363,7 @@
 Source: #{@package}
 Version: #{@version}
 Severity: serious
-Tags: wheezy sid
+Tags: jessie sid
 User: debian-qa at lists.debian.org
 Usertags: qa-ftbfs-#{sdate} qa-ftbfs
 Justification: FTBFS on amd64