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

[goneri-guest at alioth.debian.org]

Author: goneri-guest
Date: 2007-09-19 13:57:03 +0000 (Wed, 19 Sep 2007)
New Revision: 461

Modified:
   svnbuildstat/README
   svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm
   svnbuildstat/script/clean.pl
Log:
some remaining changes


Modified: svnbuildstat/README
===================================================================
--- svnbuildstat/README	2007-09-19 12:04:57 UTC (rev 460)
+++ svnbuildstat/README	2007-09-19 13:57:03 UTC (rev 461)
@@ -67,4 +67,12 @@
       </Location>
   
   </VirtualHost>
-  
+
+Crontab:
+*/30 *    * * * root /home/sites/svnbuildstat.debian.net/svnbuildstat/script/svnbuildstat_update-db.pl > /dev/null 2>&1
+5 *    * * * root /home/sites/svnbuildstat.debian.net/svnbuildstat/script/svnbuildstat_update-bugs.pl > /dev/null 2>&1
+* *    * * * root /home/sites/svnbuildstat.debian.net/svnbuildstat/script/svnbuildstat_update-repository.pl > /dev/null 2>&1
+* *    * * * root /home/sites/svnbuildstat.debian.net/svnbuildstat/script/svnbuildstat_import-new-report.pl > /dev/null 2>&1
+0 0    * * * root /home/sites/svnbuildstat.debian.net/svnbuildstat/script/svnbuildstat_purge-buildinprogress.pl > /dev/null 2>&1
+
+

Modified: svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm
===================================================================
--- svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm	2007-09-19 12:04:57 UTC (rev 460)
+++ svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm	2007-09-19 13:57:03 UTC (rev 461)
@@ -150,13 +150,7 @@
 while (($cpt++ < 10) && (my $build = $build_rs->next)) {
 my $failedstep;
 if (!$build->buildisok) {
-	if (!$build->checkoutisok) {
-		$failedstep = "check out";
-	} elsif (!$build->downloadisok) {
-		$failedstep = "download";
-	} else {
 		$failedstep = "build";
-	}
 }
 
   push @{$c->stash->{builds}}, {
@@ -178,8 +172,7 @@
 $c->stash->{template} = 'packages/info.tt2';
 
 }
-
-sub tobuild : Local {
+sub tobuildv2 : Local {
   my ($self, $c, $arch) = @_;
   my $archs = "(i386|m68k|sparc|alpha|powerpc|".
   "arm|mips|mipsel|hppa|ia64|s390|amd64|".
@@ -191,37 +184,20 @@
     return;
   }
 
-  my $archobj = $c->model('SvnBuildStat::WWW::Model::DB::Arch')->find_or_create ({name => $arch});
-
-  #my $package_rs = $c->model('SvnBuildStat::WWW::Model::DB::Viewpackage')->search({istarballpresent => 'true', },{order_by=> "builded, lastbuilddate"});
-  #my $tmp = $c->model('SvnBuildStat::WWW::Model::DB::Viewtobuild')->first;
-  my $tmp = $c->model('SvnBuildStat::WWW::Model::DB::Viewtobuild')->search({$arch => 'true', })->first;
+  my $tmp = $c->model('SvnBuildStat::WWW::Model::DB::Viewtobuild2')->search({$arch => 'true' })->first;
   my $package = $c->model('SvnBuildStat::WWW::Model::DB::Package')->search ({id => $tmp->id})->first;
 
 
-  my $resp = '';
-  my $tarball;
-  my $tarballuri;
-    # TODO next unless arch is supported
-
-  my $name = $package->name;
-  my $uri = $package->uri;
-
-  if ($package->isnative ne 't') {
-    $tarballuri = $package->tarballuri;
-
-    $tarballuri =~ s/\@PACKAGE@/$package->name/;
-    $tarballuri =~ s/\@TARBALL@/$package->svndebrelease/;
-
-    $tarball = mkTarballFromPackage(\$package);
-  }
-
   $package->lastbuildstart('now');
   $package->update();
-  $resp = "$name;$tarballuri;$tarball;$uri";
 
-  $c->response->body($resp);
+  my $svndebrelease = $package->realsvndebrelease;
+  $svndebrelease =~ s/^\d+://; # remove the EPOCH 
+
+  # TODO: put the repository URL in the cfg
+  $c->response->body("http://nana.rulezlan.org/debian/".$package->name."_".$svndebrelease.".dsc");
 }
+
 =head1 AUTHOR
 
 Goneri Le Bouder,,,

Modified: svnbuildstat/script/clean.pl
===================================================================
--- svnbuildstat/script/clean.pl	2007-09-19 12:04:57 UTC (rev 460)
+++ svnbuildstat/script/clean.pl	2007-09-19 13:57:03 UTC (rev 461)
@@ -23,7 +23,8 @@
 my $package = $schema->resultset('Package')->search({name => $pkgname})->first;
 die unless $package;
 
-my $build_rs = $schema->resultset('Build')->search({package_id => $package->id, rev => $package->rev});
+#my $build_rs = $schema->resultset('Build')->search({package_id => $package->id, rev => $package->rev});
+my $build_rs = $schema->resultset('Build')->search({package_id => $package->id});
 
 $build_rs->delete_all;
 while (my $build = $build_rs->next) {