[Collab-qa-commits] r431 - svnbuildstat/script

[goneri-guest at alioth.debian.org]

Author: goneri-guest
Date: 2007-09-11 19:58:52 +0000 (Tue, 11 Sep 2007)
New Revision: 431

Modified:
   svnbuildstat/script/svnbuildstat_import-new-report.pl
Log:
improve the output


Modified: svnbuildstat/script/svnbuildstat_import-new-report.pl
===================================================================
--- svnbuildstat/script/svnbuildstat_import-new-report.pl	2007-09-11 19:58:01 UTC (rev 430)
+++ svnbuildstat/script/svnbuildstat_import-new-report.pl	2007-09-11 19:58:52 UTC (rev 431)
@@ -46,7 +46,8 @@
   my $st = stat($reporttarball);
   if ((!$reporttarball =~ /.*\/(.+)_(\d+)_(.+)_(.+)\.tar$/) ||
   !$st || ($st->mtime < time - 3600)) {
-  move($reporttarball, $rejecteddir);
+    print "$reporttarball> tarball too old\n";
+    move($reporttarball, $rejecteddir);
     next;
   }
   print localtime().": new report ".$reporttarball."\n";
@@ -54,6 +55,7 @@
 
   my %report;
   if (!open INFO, "<$workdir/report/info") {
+    print "$reporttarball> can't open info file\n";
     move($reporttarball, $rejecteddir);
     `rm -r $workdir/report`;
     next;
@@ -63,6 +65,14 @@
   }
   close INFO;
 
+  if (!($report{source})||!($report{hostname})||!($report{svn_rev})) {
+    print "$reporttarball> invalide info file\n";
+    move($reporttarball, $rejecteddir);
+    `rm -r $workdir/report`;
+    next;
+  }
+
+
   foreach my $logfile (qw/build.log lintian.log linda.log piuparts.log/) {
     if (open TMP, "<$workdir/report/$logfile") {
       $report{$logfile} = '';
@@ -79,7 +89,7 @@
       $report{source}})->first;
   
   if (!$package) {
-    print "unknow package: $report{source}\n";
+    print "$reporttarball> unknow package: $report{source}\n";
     move($reporttarball, $rejecteddir);
     next;
   }