[Collab-qa-commits] r373 - in svnbuildstat: lib/SvnBuildStat/WWW/Controller script

[goneri-guest at alioth.debian.org]

Author: goneri-guest
Date: 2007-08-08 14:48:38 +0000 (Wed, 08 Aug 2007)
New Revision: 373

Modified:
   svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm
   svnbuildstat/script/svnbuildstat_import-new-report.pl
   svnbuildstat/script/svnbuildstat_update-db.pl
Log:
remove "isbuildinprogress" from the code. It's not used anymore


Modified: svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm
===================================================================
--- svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm	2007-08-08 13:36:57 UTC (rev 372)
+++ svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm	2007-08-08 14:48:38 UTC (rev 373)
@@ -122,7 +122,7 @@
   }
 
 ##########
-my $build = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search({package_id => $package->id, isbuildinprogress => 'false'},{order_by => "id DESC"})->first;
+my $build = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search({package_id => $package->id},{order_by => "id DESC"})->first;
 if ($build) {
 foreach (split $/, $build->lintian_log) {
 my $error;
@@ -140,7 +140,7 @@
 }
 ##############
 
-my $build_rs = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search({package_id => $package->id, isbuildinprogress => 'false'},{order_by => "id DESC"});
+my $build_rs = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search({package_id => $package->id},{order_by => "id DESC"});
 my $cpt;
 while (($cpt++ < 10) && (my $build = $build_rs->next)) {
 my $failedstep;

Modified: svnbuildstat/script/svnbuildstat_import-new-report.pl
===================================================================
--- svnbuildstat/script/svnbuildstat_import-new-report.pl	2007-08-08 13:36:57 UTC (rev 372)
+++ svnbuildstat/script/svnbuildstat_import-new-report.pl	2007-08-08 14:48:38 UTC (rev 373)
@@ -24,7 +24,6 @@
 
 my @sourcedir;
 my @reporttarball;
-my @lockfile;
 foreach (split / /,$config->report_sourcedir()) {
   if (!-d) {
     print STDERR "Error in the sourcedir section of the config file.".
@@ -32,7 +31,6 @@
     next;
   }
   push @reporttarball, <$_/*.tar>;
-  push @lockfile, <$_/*.lock>;
 }
 my $workdir = $config->report_workdir();
 my $rejecteddir = $config->report_rejecteddir();
@@ -41,36 +39,7 @@
 die "Please create `$rejecteddir' directory." unless -d $rejecteddir;
 
 my $build_rs = $schema->resultset('Build');
-# Park the locked package as being
-foreach my $lockfile (@lockfile) {
-  if ($lockfile =~ /.*\/(.+)_(\d+)_(.+)_(.+)\.lock$/) {
-    my $packagesrc = $1;
-    my $rev = $2;
-    my $archname = $3;
-    my $distro = $4;
 
-    print "store the distro: ($distro)\n";
-    
-    my $package = $schema->resultset('Package')->search({name => $packagesrc})->first;
-    my $arch = $schema->resultset('Arch')->find_or_create({name => $archname});
-
-    if ($package) {
-      my $build = $schema->resultset('Build')->find_or_create({
-	  package_id => $package->id,
-	  arch_id => $arch->id,
-	  rev => $rev,
-	});
-
-      if ($build->host_id) { # a completed build exist already
-	unlink ($lockfile) or warn "Failed to unlink $lockfile\n";
-      } else {
-	$build->time('now');
-	$build->isbuildinprogress ('true');
-	$build->update;
-      }
-    }
-  }
-}
 # Load the new report
 foreach my $reporttarball (@reporttarball) {
 
@@ -122,9 +91,6 @@
       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});
@@ -142,7 +108,6 @@
   $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;
@@ -222,34 +187,16 @@
 
   $build->update;
 
-  my $lockfile = $package->name."_".$report{svn_rev}."_".$report{source}.".lock";
-  foreach (@lockfile) {
-    if ($_ eq $lockfile) {
-      unlink ($_) or warn "Can't unlink $_\n";
-    }
-  }
   unlink $reporttarball or warn "Can't unlink $reporttarball\n";
 
   `rm -r $workdir/report`;
   unlink $reporttarball;
 }
 
-### PURGE
-foreach (@lockfile) {
+### PURGE of the lock file. To remove after the agent migration
 
-  my $sb = stat($_);
-  next unless $sb;
-  unlink $_ if (time - $sb->mtime > 3600*4);
+my @lockfile;
 
+foreach (split / /,$config->report_sourcedir()) {
+  unlink if (-f && /lock$/);
 }
-
-$build_rs = $schema->resultset('Build')->search({
-    isbuildinprogress => 'true'
-  });
-
-#TODO
-#while (my $build = $build_rs->next) {
-#  $build->delete if (time - $build->time > 3600*4);
-#}
-
-

Modified: svnbuildstat/script/svnbuildstat_update-db.pl
===================================================================
--- svnbuildstat/script/svnbuildstat_update-db.pl	2007-08-08 13:36:57 UTC (rev 372)
+++ svnbuildstat/script/svnbuildstat_update-db.pl	2007-08-08 14:48:38 UTC (rev 373)
@@ -301,7 +301,7 @@
     $uri =~ s/(|\/)debian\/control$//;
     push @uri, $uri;
   }
-print "Yo!\n";
+  
   foreach my $uri (@uri) {
     # look for packages
     $poolImportPkg->add($repository,$uri,$tarballonrepository) or die "Fucked\n";