[Collab-qa-commits] r394 - log-analysis

[lucas at alioth.debian.org]

Author: lucas
Date: 2007-08-29 21:14:41 +0000 (Wed, 29 Aug 2007)
New Revision: 394

Modified:
   log-analysis/parse-logs-piuparts.rb
Log:
improved parse-logs-piuparts

Modified: log-analysis/parse-logs-piuparts.rb
===================================================================
--- log-analysis/parse-logs-piuparts.rb	2007-08-26 19:58:16 UTC (rev 393)
+++ log-analysis/parse-logs-piuparts.rb	2007-08-29 21:14:41 UTC (rev 394)
@@ -3,12 +3,12 @@
 dir = ARGV[0]
 
 REASONS = [
-#  [ /ERROR: Broken symlinks:$/, 'BRKSYM' ],
-#  [ /ERROR: After purging files have been modified:$/, 'FILESMODIFIED' ],
-#  [ /ERROR: Command failed/, 'CMDFAILED' ],
-#  [ /ERROR: Processes are running inside chroot:$/, 'PROCESSESRUNNING' ],
-#  [ /ERROR: Package purging left files on system:/, 'LEFTFILES' ],
-#  [ /ERROR: After purging files have disappeared:/, 'FILESDISA' ],
+   [ /ERROR: Broken symlinks:$/, 'BRKSYM' ],
+   [ /ERROR: After purging files have been modified:$/, 'FILESMODIFIED' ],
+   [ /ERROR: Command failed/, 'CMDFAILED' ],
+   [ /ERROR: Processes are running inside chroot:$/, 'PROCESSESRUNNING' ],
+   [ /ERROR: Package purging left files on system:/, 'LEFTFILES' ],
+   [ /ERROR: After purging files have disappeared:/, 'FILESDISA' ],
    [ /(add|del)(user|group): command not found/, 'ADDUSER_NOT_FOUND' ],
    [ /(user|group)(del|add): command not found/, 'PASSWD_NOT_FOUND' ],
    [ /update-inetd: command not found/, 'INETD_NOT_FOUND' ],
@@ -19,16 +19,13 @@
    [ /sbin\/update-modules: No such file or directory/, 'UPDATE_MODULES_NOT_FOUND' ],
    [ /^  E: Broken packages$/, 'BRKPKG' ],
    [ /dbconfig-common:/, 'DBCONFIG_COMMON' ],
-#  [ /mysql/, 'MYSQL' ],
-#  [ /linux-image/, 'LINUXIMAGE' ],
 ]
 
-  #[ /ERROR: FAIL: Installation and purging test.$/, 'FAILEDINSTPURGE' ],
 (Dir::entries(dir) - ['.', '..']).each do |f|
   s = IO::read(dir + '/' + f)
   h = s.grep(/^DC-Piuparts-Header: /)[0]
   stat = s.grep(/^DC-Piuparts-Status: /)[0]
-  rest1, p, v, rest2 = h.split(' ',4)
+  rest1, pkg, v, rest2 = h.split(' ',4)
   if stat.nil? # build not finished
     result = "Unknown"
     duration = "0s"
@@ -50,5 +47,14 @@
       reason = reasons.join('/')
     end
   end
-  puts "#{p} #{result} #{duration} #{reason}"
+  # fetch version
+  setups = s.scan(/^  Setting up #{pkg} \((.*)\) ...$/)
+  if setups.length == 0
+    vers = 'UKN'
+  elsif setups.length == 1
+    vers = setups[0][0]
+  elsif setups.length >= 2
+     vers = "#{setups[0][0]}/#{setups[1][0]}"
+  end
+  puts "#{pkg} #{vers} #{result} #{duration} #{reason}"
 end