r2642 - people/goneri/SvnBuildStat-WWW/script

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-05-10 07:41:36 +0000 (Thu, 10 May 2007)
New Revision: 2642

Modified:
   people/goneri/SvnBuildStat-WWW/script/svnbuildstat_import-new-report.pl
Log:
some minor warning fixes


Modified: people/goneri/SvnBuildStat-WWW/script/svnbuildstat_import-new-report.pl
===================================================================
--- people/goneri/SvnBuildStat-WWW/script/svnbuildstat_import-new-report.pl	2007-05-09 21:20:28 UTC (rev 2641)
+++ people/goneri/SvnBuildStat-WWW/script/svnbuildstat_import-new-report.pl	2007-05-10 07:41:36 UTC (rev 2642)
@@ -2,11 +2,13 @@
 
 use strict;
 
-use lib '/usr/local/www/sites/nana.rulezlan.org/svnbuildstat/lib';
+use lib '/usr/local/www/sites/svnbuildstat.debian.net/svnbuildstat/lib';
 use File::Glob ':globally';
 
 use File::stat;
 
+use Encode;
+
 use SvnBuildStat::Config;
 use SvnBuildStat::Schema;
 
@@ -70,7 +72,7 @@
 }
 # Load the new report
 foreach my $reporttarball (@reporttarball) {
-  print localtime().": new report".$reporttarball."\n";
+  print localtime().": new report ".$reporttarball."\n";
   `cd $workdir && tar xf $reporttarball`;
 
   my %report;
@@ -87,10 +89,12 @@
   foreach my $logfile (qw/build.log lintian.log linda.log piuparts.log/) {
     if (open TMP, "<$workdir/report/$logfile") {
       $report{$logfile} = '';
-      $report{$logfile} .= $_ foreach (<TMP>);
+      foreach (<TMP>) {
+	$report{$logfile} .= encode("UTF-8", $_);
+      }
       close TMP;
     } else {
-	    $report{$logfile} = undef; 
+      $report{$logfile} = undef; 
     }
   }
 
@@ -110,50 +114,68 @@
       rev => $report{svn_rev},
     });
   $build->time('now');
+  $build->update;
   $build->isbuildinprogress('false');
+  $build->update;
   $build->set_from_related('host_id', $host);
+  $build->update;
   $build->svndebrelease ($report{release});
+  $build->update;
   $build->buildisok ($report{build} eq "ok"?"true":"false");
+  $build->update;
   $build->checkoutisok ($report{checkout} eq "ok"?"true":"false");
+  $build->update;
   $build->downloadisok ($report{download} eq "ok"?"true":"false");
+  $build->update;
   $build->duration
   ($report{'stamp_build-end'}-$report{'stamp_build-start'});
+  $build->update;
   $build->build_log ($report{'build.log'});
+  $build->update;
   $build->lintian_log ($report{'lintian.log'});
   $build->update;
   $report{'linda.log'} =~ s/(.+The character ').+(' is forbidden.+)/$1 $2/g;
+  $build->update;
   $build->linda_log ($report{'linda.log'});
   $build->update;
   $build->piuparts_log ($report{'piuparts.log'});
+  $build->update;
   $build->lintian_release ($report{lintian_release});
+  $build->update;
   $build->linda_release ($report{linda_release});
   $build->piuparts_release ($report{piuparts_release});
+  $build->update;
   $build->svnbp_release ($report{'svnbp_release'});
   $build->pbuilder_release ($report{pbuilder_release});
+  $build->update;
   $build->agent_release ($report{agent_release});
   $build->update;
 
 
   # lintian
   my %lintian;
-  foreach (split $/, $report{'lintian.log'}) {
-    $lintian{$2} = $1 if (/^(.): \S*: (\S*)/);
-  }
-  my @lintian;
-  foreach (keys %lintian) {
-    my $iserror = ($lintian{$_} eq "E")?1:0;
+  if ($report{'lintian.log'}) {
+    foreach (split $/, $report{'lintian.log'}) {
+      $lintian{$2} = $1 if (/^(.): \S*: (\S*)/);
+    }
+    my @lintian;
+    foreach (keys %lintian) {
+      my $iserror = ($lintian{$_} eq "E")?1:0;
 
-    my $lintian= $schema->resultset('Lintian')->find_or_create(name => $_);
-    $lintian->iserror($iserror);
-    my $build_lintian =
-    $build->find_or_create_related('build_lintians', {
-	lintian_id => $lintian->id});
+      my $lintian= $schema->resultset('Lintian')->find_or_create(name => $_);
+      $lintian->iserror($iserror);
+      my $build_lintian =
+      $build->find_or_create_related('build_lintians', {
+	  lintian_id => $lintian->id});
+    }
   }
 
   # linda
   my %linda;
-  foreach (split $/, $report{'linda.log'}) {
-    $linda{$2} = $1 if (/^(.):.*\((\S*)\)$/);
+  if ($report{'linda.log'}) {
+    foreach (split $/, $report{'linda.log'}) {
+      $linda{$2} = $1 if (/^(.):.*\((\S*)\)$/);
+    }
   }
 
   my @linda;
@@ -168,8 +190,10 @@
   }
 
   # piuparts 
-  foreach (split $/, $report{'piuparts.log'}) {
-    $build->piupartsisok(1) if (/INFO: PASS: All tests./);
+  if ($report{'piuparts.log'}) {
+    foreach (split $/, $report{'piuparts.log'}) {
+      $build->piupartsisok(1) if (/INFO: PASS: All tests./);
+    }
   }