r3206 - in people/goneri/SvnBuildStat-WWW: lib/SvnBuildStat/WWW/Controller root/src/packages

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-07-03 19:04:10 +0000 (Tue, 03 Jul 2007)
New Revision: 3206

Modified:
   people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm
   people/goneri/SvnBuildStat-WWW/root/src/packages/info.tt2
   people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2
Log:
some pending changes


Modified: people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm
===================================================================
--- people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm	2007-07-03 19:03:05 UTC (rev 3205)
+++ people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm	2007-07-03 19:04:10 UTC (rev 3206)
@@ -96,6 +96,7 @@
   $c->stash->{isindebian} = $package->isindebian;
   $c->stash->{tarballuri} = $package->tarballuri;
   $c->stash->{svndebrelease} = $package->svndebrelease;
+  $c->stash->{iswatchfilebroken} = $package->iswatchfilebroken;
   $c->stash->{uri} = $package->uri;
   $c->stash->{weburi} = $package->uri;
   $c->stash->{weburi} =~ s!svn://svn.debian.org/svn!http://svn.debian.org/wsvn!;
@@ -188,7 +189,8 @@
   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 $package = $c->model('SvnBuildStat::WWW::Model::DB::Viewtobuild')->first;
+  my $package_id = $c->model('SvnBuildStat::WWW::Model::DB::Viewtobuild')->first;
+  my $package = $c->model('SvnBuildStat::WWW::Model::DB::Package')->search ({id => $package_id->package_id})->first;
 
 
   my $resp = '';
@@ -208,6 +210,8 @@
     $tarball = mkTarballFromPackage(\$package);
   }
 
+  $package->lastbuildstart('now');
+  $package->update();
   $resp = "$name;$tarballuri;$tarball;$uri";
 
   $c->response->body($resp);

Modified: people/goneri/SvnBuildStat-WWW/root/src/packages/info.tt2
===================================================================
--- people/goneri/SvnBuildStat-WWW/root/src/packages/info.tt2	2007-07-03 19:03:05 UTC (rev 3205)
+++ people/goneri/SvnBuildStat-WWW/root/src/packages/info.tt2	2007-07-03 19:04:10 UTC (rev 3206)
@@ -20,16 +20,21 @@
   <td>Repository location: <a href="[% uri %]">SVN</a> <a href="[% weburi %]">HTTP</a></td>
 </tr>
 <tr>
-<td [% IF ! istarballpresent %]class="error"[% END %]>
+<td [% IF iswatchfilebroken || !istarballpresent %]class="error"[% END %]>
+  [% IF iswatchfilebroken %]
+  Broken watchfile
+  [% ELSE %]
   [% IF istarballpresent %]
   <a href="[% tarballuri %]">Tarball</a>
   [% ELSE %]
   Can't find the tarball
   [% END %]
+  [% END %]
   </td>
 </tr>
-[% IF isuptodate == 0 %]
-<tr><td class="error">A new upstream ([% upstreamrelease %]) release exists.</a></td></tr>
+[% IF !iswatchfilebroken && isuptodate == 0 %]
+<tr><td class="error">A new upstream ([% upstreamrelease %]) release exists.</a></td>
+</tr>
 [% END %]
 </table>
 

Modified: people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2
===================================================================
--- people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2	2007-07-03 19:03:05 UTC (rev 3205)
+++ people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2	2007-07-03 19:04:10 UTC (rev 3206)
@@ -60,7 +60,7 @@
     <td [% IF package.isindebian %]class="ok"[% ELSE %]class="warning"[% END %]>
         [% IF ! package.isindebian %]No[% END %]
     </td>
-    <td [% IF package.isuptodate == 1 || package.isnative == 1 %]class="ok"[% ELSE %][% IF package.iswatchfilebroken == 1 || package.isuptodate == 0 %]class="error"[% ELSE %][% IF package.isuptodate == "" %]class="warning"[% END %][% END %][% END %]>
+    <td [% IF package.iswatchfilebroken || package.isuptodate == 0 %]class="error"[% ELSE %][% IF package.isuptodate == 1 || package.isnative == 1 %]class="ok"[% ELSE %]class="warning"[% END %][% END %]>
     <a href="[% Catalyst.uri_for('info/') _ package.name %]">
         [% IF package.isnative == 1 %]
 	  Native