r2622 - in people/goneri/SvnBuildStat-WWW: ! dirs' list truncated !
Gonéri Le Bouder
goneri-guest at alioth.debian.org
Tue May 1 01:08:42 UTC 2007
Author: goneri-guest
Date: 2007-05-01 01:08:41 +0000 (Tue, 01 May 2007)
New Revision: 2622
Modified:
people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Logs.pm
people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm
people/goneri/SvnBuildStat-WWW/root/src/logs/build.tt2
people/goneri/SvnBuildStat-WWW/root/src/logs/piuparts.tt2
people/goneri/SvnBuildStat-WWW/root/src/packages/info.tt2
people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2
people/goneri/SvnBuildStat-WWW/root/src/ttsite.css
people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl
Log:
a log entry
Modified: people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Logs.pm
===================================================================
--- people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Logs.pm 2007-04-30 22:26:40 UTC (rev 2621)
+++ people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Logs.pm 2007-05-01 01:08:41 UTC (rev 2622)
@@ -50,17 +50,15 @@
$line++;
my $orig = $_;
if (s/(error|warning|failed)/<strong id="$line">$1<\/strong>/gi) {
- push @errindex, {
+ push @{$c->stash->{'erridx'}}, {
linenum => $line,
content => $orig
}
}
-
- $htmllog .= $_."<br />";
+ push @{$c->stash->{'lines'}}, $_;
}
$c->stash->{'log'} = {
- 'errindex' => \@errindex,
'package' => $build->package_id->name,
'arch' => $build->arch_id->name,
'buildisok' => $build->buildisok,
@@ -94,25 +92,25 @@
$line++;
my $orig = $_;
if (s/(error|warning|failed)/<strong id="$line">$1<\/strong>/gi) {
- push @errindex, {
+ push @{$c->stash->{'erridx'}}, {
linenum => $line,
content => $orig
}
}
-
- $htmllog .= $_."<br />";
+ push @{$c->stash->{'lines'}}, $_;
}
$c->stash->{'log'} = {
- 'errindex' => \@errindex,
'package' => $build->package_id->name,
'arch' => $build->arch_id->name,
'buildisok' => $build->buildisok,
- 'log' => $htmllog
+ 'log' => $htmllog,
+ piuparts_release => $build->piuparts_release
};
$c->stash->{template} = 'logs/piuparts.tt2';
}
+
1;
Modified: people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm
===================================================================
--- people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm 2007-04-30 22:26:40 UTC (rev 2621)
+++ people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm 2007-05-01 01:08:41 UTC (rev 2622)
@@ -59,7 +59,7 @@
} elsif ($param =~ /^\d+$/) {
$package_rs = $c->model('SvnBuildStat::WWW::Model::DB::Package')->search ({repository_id => $param}, {order_by => 'name'});
- } else {
+ } else { # I don't want to kill my server with to much request
$c->response->redirect($c->uri_for('/repositorys/list'));
return;
}
@@ -75,11 +75,13 @@
my $lindaerrcount;
my $buildok;
my $bugcount;
- my $bugwarning;
+ my $bugerror;
my $buildisok;
+ my $piupartsisok;
if ($build) {
$buildisok = 1 if $build->buildisok;
$needbuild = 0 if $build->rev eq $package->rev;
+ $piupartsisok = 1 if $build->piupartsisok;
$lintianerrcount = $c->model('SvnBuildStat::WWW::Model::DB::BuildLintian')->search (
{build_id => $build->id})->count;
$lindaerrcount= $c->model('SvnBuildStat::WWW::Model::DB::BuildLinda')->search (
@@ -88,7 +90,7 @@
my $bug_rs = $c->model('SvnBuildStat::WWW::Model::DB::Bug')->search(package_id => $package->id);
$bugcount = $bug_rs->count;
while (my $bug = $bug_rs->next) {
- $bugwarning = 1 if ($bug->severity_id->name =~ /important|serious|grave|critical/);
+ $bugerror = 1 if ($bug->severity_id->name =~ /important|serious|grave|critical/);
}
push @{$c->stash->{packages}}, {
@@ -100,8 +102,11 @@
lintianerrcount => $lintianerrcount,
lindaerrcount => $lindaerrcount,
bugcount => $bugcount,
- bugwarning => $bugwarning,
- buildisok => $buildisok
+ bugerror => $bugerror,
+ buildisok => $buildisok,
+ piupartsisok => $piupartsisok,
+ isindebian => $package->isindebian,
+ svndebrelease => $package->svndebrelease,
};
}
@@ -132,12 +137,15 @@
#############
my $bug_rs = $c->model('SvnBuildStat::WWW::Model::DB::Bug')->search(package_id => $package->id);
while (my $bug = $bug_rs->next) {
+ my $bugerror;
my $bugwarning;
- $bugwarning = 1 if ($bug->severity_id->name =~ /important|serious|grave|critical/);
+ $bugerror = 1 if ($bug->severity_id->name =~ /important|serious|grave|critical/);
+ $bugwarning = 1 if ($bug->severity_id->name =~ /normal/);
push @{$c->stash->{bugs}}, {
id => $bug->id,
name => $bug->name,
severity => $bug->severity_id->name,
+ error => $bugerror,
warning => $bugwarning }
}
@@ -145,15 +153,15 @@
my $build = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search({package_id => $package->id, isbuildinprogress => 'false'},{order_by => "id DESC"})->first;
if ($build) {
foreach (split $/, $build->lintian_log) {
- my $warning;
- $warning = 1 if /^E/;
- push @{$c->stash->{lintians}}, { text => $_, warning => $warning };
+ my $error;
+ $error = 1 if /^E/;
+ push @{$c->stash->{lintians}}, { text => $_, error => $error };
}
foreach (split $/, $build->linda_log) {
- my $warning;
- $warning = 1 if /^E/;
- push @{$c->stash->{lindas}}, { text => $_, warning => $warning } ;
+ my $error;
+ $error = 1 if /^E/;
+ push @{$c->stash->{lindas}}, { text => $_, error => $error } ;
}
$c->stash->{piupartsisok} = $build->piupartsisok;
@@ -178,6 +186,7 @@
buildisok => $build->buildisok,
rev => $build->rev,
duration => $build->duration,
+ arch => $build->arch_id->name,
failedstep => $failedstep,
}
}
@@ -229,6 +238,7 @@
my $tarball = mkTarballFromPackage(\$package);
$c->response->body("$name;$rev;$tarballuri;$tarball;$uri");
+ last if (rand(10) == 5); # the poor man randomizer
}
}
=head1 AUTHOR
Modified: people/goneri/SvnBuildStat-WWW/root/src/logs/build.tt2
===================================================================
--- people/goneri/SvnBuildStat-WWW/root/src/logs/build.tt2 2007-04-30 22:26:40 UTC (rev 2621)
+++ people/goneri/SvnBuildStat-WWW/root/src/logs/build.tt2 2007-05-01 01:08:41 UTC (rev 2622)
@@ -14,10 +14,15 @@
Build failed
[% END %]
+<<<<<<< .mine
+[% IF erridx %]
+<h2>autodetected possible error in log</h2>
+=======
[% IF log.errindex %]
<h2>autodetected possible error in log</h2>
+>>>>>>> .r2621
<ul>
- [% FOREACH err IN log.errindex -%]
+ [% FOREACH err IN erridx -%]
<li><a href="#[% err.linenum %]">[% err.content %]</a></li>
[% END %]
</ul>
@@ -27,5 +32,7 @@
<h2>log</h2>
<blockquote>
-[% log.log %]
+ [% FOREACH line IN lines -%]
+ [% line %]<br />
+ [% END %]
</blockquote>
Modified: people/goneri/SvnBuildStat-WWW/root/src/logs/piuparts.tt2
===================================================================
--- people/goneri/SvnBuildStat-WWW/root/src/logs/piuparts.tt2 2007-04-30 22:26:40 UTC (rev 2621)
+++ people/goneri/SvnBuildStat-WWW/root/src/logs/piuparts.tt2 2007-05-01 01:08:41 UTC (rev 2622)
@@ -9,10 +9,15 @@
Piuparts ([% log.piuparts_release %]) checks failed
[% END %]
+<<<<<<< .mine
+[% IF erridx %]
+<h2>autodetected possible error in log</h2>
+=======
[% IF log.errindex %]
<h2>autodetected possible error in log</h2>
+>>>>>>> .r2621
<ul>
- [% FOREACH err IN log.errindex -%]
+ [% FOREACH err IN erridx -%]
<li><a href="#[% err.linenum %]">[% err.content %]</a></li>
[% END %]
</ul>
@@ -22,5 +27,7 @@
<h2>log</h2>
<blockquote>
-[% log.log %]
+ [% FOREACH line IN lines -%]
+ [% line %]<br />
+ [% END %]
</blockquote>
Modified: people/goneri/SvnBuildStat-WWW/root/src/packages/info.tt2
===================================================================
--- people/goneri/SvnBuildStat-WWW/root/src/packages/info.tt2 2007-04-30 22:26:40 UTC (rev 2621)
+++ people/goneri/SvnBuildStat-WWW/root/src/packages/info.tt2 2007-05-01 01:08:41 UTC (rev 2622)
@@ -14,11 +14,34 @@
[% END -%]
</table>
+<<<<<<< .mine
<h2>URI</h2>
<table>
<tr>
<td><a href="[% uri %]">Repository</a></td>
</tr>
+<tr [% IF ! istarballpresent %]class="error"[% END %]>
+ [% IF istarballpresent %]
+ <a href="[% tarballuri %]">Tarball</a>
+ [% ELSE %]
+ Can't find the tarball
+ [% END %]
+</tr>
+</table>
+
+[% IF isindebian %]
+ <div>This release is in Debian</div>
+[% ELSE %]
+ <div>This release is not in Debian</div>
+[% END %]
+
+
+=======
+<h2>URI</h2>
+<table>
+<tr>
+ <td><a href="[% uri %]">Repository</a></td>
+</tr>
<tr [% IF ! istarballpresent %]class="warning"[% END %]>
[% IF istarballpresent %]
<a href="[% tarballuri %]">Tarball</a>
@@ -35,12 +58,17 @@
[% END %]
+>>>>>>> .r2621
[% IF bugs %]
<h2>Bugs</h2>
<table>
[% # Display each book in a table row %]
[% FOREACH bug IN bugs -%]
+<<<<<<< .mine
+ <tr [% IF bug.error %] class="error"[% ELSE %][% IF bug.warning %] class="warning"[% END %][% END %]>
+=======
<tr [% IF bug.warning %] class="warning"[% END %]>
+>>>>>>> .r2621
<td>
<a href="http://bugs.debian.org/[% bug.id %]">[% bug.id %]: [% bug.name %]</a>
</td>
@@ -57,11 +85,15 @@
[% IF builds %]
<h2>Builds</h2>
<table>
- <tr><th>Status</th><th>Svn Rev.</th><th>Build duration</th><th>Linda</th><th>Lintian</th><th>Bugs</th></tr>
+ <tr><th>Status</th><th>Arch</th><th>Svn Rev.</th><th>Build duration</th></tr>
[% # Display each book in a table row %]
[% FOREACH build IN builds -%]
<tr>
+<<<<<<< .mine
+ <td [% IF ! build.buildisok %] class="error"[% END %]>
+=======
<td [% IF ! build.buildisok %] class="warning"[% END %]>
+>>>>>>> .r2621
[% IF build.buildisok %]
<a href="[% Catalyst.uri_for('/logs/build/') _ build.id %]">Success</a>
[% ELSE %]
@@ -71,14 +103,14 @@
</td>
<td>
+ [% build.arch %]
+ </td>
+ <td>
[% build.rev %]
</td>
<td>
[% IF build.duration %][% build.duration %]s[% END %]
</td>
- <td>
- [% build.id %]
- </td>
</tr>
[% END -%]
</table>
@@ -87,33 +119,57 @@
[% IF piupartsisok %]
<a href="[% Catalyst.uri_for('/logs/piuparts/') _ build.id %]">piuparts checks successed</a>
[% ELSE %]
-<a href="[% Catalyst.uri_for('/logs/piuparts/') _ build.id %]">piuparts checks failed</a>
+<a href="[% Catalyst.uri_for('/logs/piuparts/') _ build.id %]">piuparts checks failed (maybe a false negatif?)</a>
[% END %]
[% IF lintians %]
<h2>lintian</h2>
+<<<<<<< .mine
<table>
[% FOREACH lintian IN lintians %]
<tr>
+ <td [% IF lintian.error %]class="error"[% END %]>
+ [% lintian.text %]
+ </td>
+ </tr>
+ [% END -%]
+</table>
+=======
+<table>
+ [% FOREACH lintian IN lintians %]
+ <tr>
<td [% IF lintian.warning %]class="warning"[% END %]>
[% lintian.text %]
</td>
</tr>
[% END -%]
</table>
+>>>>>>> .r2621
[% END %]
[% IF lindas %]
<h2>linda</h2>
+<<<<<<< .mine
<table>
[% FOREACH linda IN lindas %]
<tr>
+ <td [% IF linda.error %]class="error"[% END %]>
+ [% linda.text %]
+ </td>
+ </tr>
+ [% END -%]
+</table>
+=======
+<table>
+ [% FOREACH linda IN lindas %]
+ <tr>
<td [% IF linda.warning %]class="warning"[% END %]>
[% linda.text %]
</td>
</tr>
[% END -%]
</table>
+>>>>>>> .r2621
[% END %]
[% ELSE %]
Modified: people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2
===================================================================
--- people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2 2007-04-30 22:26:40 UTC (rev 2621)
+++ people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2 2007-05-01 01:08:41 UTC (rev 2622)
@@ -15,20 +15,34 @@
</h1>
<table>
+<<<<<<< .mine
+<tr><th>Packages</th><th>Status</th><th>Linda</th><th>Lintian</th><th>Bugs</th><th>Piuparts</th><th>Synced w/Debian?</th></tr>
+=======
<tr><th>Packages</th><th>Status</th><th>Linda</th><th>Lintian</th><th>Bugs</th><th>Release In Debian?</th></tr>
+>>>>>>> .r2621
[% # Display each book in a table row %]
[% FOREACH package IN packages -%]
<tr>
<td>
<a href="[% Catalyst.uri_for('info/') _ package.name %]"><strong>[% package.name %]</strong></a>
</td>
+<<<<<<< .mine
+ <td [% IF !package.istarballpresent || (!package.needbuild && !package.buildisok) %]class="error"[% END %] [% IF package.buildisok %]class="ok"[% END %]>
+=======
<td [% IF !package.istarballpresent || (!package.needbuild && !package.buildisok) %]class="warning"[% END %] [% IF package.buildisok %]class="ok"[% END %]>
+>>>>>>> .r2621
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
+<<<<<<< .mine
[% IF ! package.istarballpresent %]
+ No tarball
+ [% ELSE %]
+=======
+ [% IF ! package.istarballpresent %]
[% 'No tarball' %]
[% ELSE %]
+>>>>>>> .r2621
[% IF package.needbuild %]
- [% 'Need build' %]
+ Need build
[% ELSE %]
[% IF package.buildisok %]
ok
@@ -39,22 +53,46 @@
[% END %]
</a>
</td>
+<<<<<<< .mine
+ <td [% IF package.lintianerrcount > 0 %]class="error"[% ELSE %][% IF ! package.needbuild && package.buildisok %]class="ok"[% END %][% END %]>
+=======
<td [% IF package.lintianerrcount %] class="warning"[% END %]>
+>>>>>>> .r2621
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
- [% package.lintianerrcount %]
+ [% IF package.lintianerrcount > 0 %][% package.lintianerrcount %][% END %]
</a>
</td>
+<<<<<<< .mine
+ <td [% IF package.lindaerrcount > 0 %]class="error"[% ELSE %][% IF ! package.needbuild && package.buildisok %]class="ok"[% END %][% END %]>
+=======
<td [% IF package.lindaerrcount %]class="warning" [% END %]>
+>>>>>>> .r2621
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
- [% package.lindaerrcount %]
+ [% IF package.lindaerrcount > 0 %][% package.lindaerrcount %][% END %]
</a>
</td>
+<<<<<<< .mine
+ <td [% IF ! package.bugcount %]class="ok"[% ELSE %][% IF package.bugerror %]class="error"[% ELSE %]class="warning"[% END %][% END %]>
+=======
<td [% IF package.bugwarning %]class="warning" [% ELSE %] [% IF ! package.bugcount %] class="ok" [% END %][% END %]>
+>>>>>>> .r2621
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
- [% package.bugcount %]
+ [% IF package.bugcount > 0 %][% package.bugcount %][% END %]
</a>
</td>
+<<<<<<< .mine
+ <td [% IF package.piupartsisok %]class="ok"[% ELSE %][% IF ! package.needbuild && package.buildisok %]class="error"[% END %][% END %]>
+ <a href="[% Catalyst.uri_for('info/') _ package.name %]">
+ [% IF ! package.needbuild && package.buildisok %][% IF package.piupartsisok %]Succeed[% ELSE %]Failed[% END %][% END %]
+ </a>
+ </td>
<td>
+ <a href="[% Catalyst.uri_for('info/') _ package.name %]">
+ [% IF package.isindebian %]Yes[% END %]
+ </a>
+ </td>
+=======
+ <td>
[% IF package.isindebian %]
Yes
[% ELSE %]
@@ -62,6 +100,7 @@
[% END %]
</a>
</td>
+>>>>>>> .r2621
</tr>
[% END -%]
</table>
Modified: people/goneri/SvnBuildStat-WWW/root/src/ttsite.css
===================================================================
--- people/goneri/SvnBuildStat-WWW/root/src/ttsite.css 2007-04-30 22:26:40 UTC (rev 2621)
+++ people/goneri/SvnBuildStat-WWW/root/src/ttsite.css 2007-05-01 01:08:41 UTC (rev 2622)
@@ -217,11 +217,10 @@
margin: 0.5em 0 0.5em 0;
}
-/*
-tr
-{
-}
-*/
+tr:hover {
+background-color: #d0d0d0;
+ padding-bottom: 3em;
+ }
td
{
@@ -230,7 +229,6 @@
padding: 0.1em 1em 0.1em 0.1em;
margin: 0;
}
-
/* Table rows with light lines seperating the rows */
td.lines
{
@@ -263,12 +261,18 @@
}
*/
-.warning
+.error
{
background-color: #e49797;
font-weight: bolder;
}
+.warning
+{
+ background-color: #f2f04b;
+ font-weight: bolder;
+}
+
.ok
{
background-color: #54cb5d;
Modified: people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl
===================================================================
--- people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl 2007-04-30 22:26:40 UTC (rev 2621)
+++ people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl 2007-05-01 01:08:41 UTC (rev 2622)
@@ -46,13 +46,23 @@
}
sub importPkg {
+<<<<<<< .mine
+ my( $repository, $uri, $tarballinrepository) = @_;
+=======
my( $repository, $uri, $rev, $tarballinrepository) = @_;
+>>>>>>> .r2621
my @maintainer;
my $packagesrc;
my $svndebrelease;
my $tarballuri;
+ my $rev;
+ foreach (`LC_ALL=C svn info $uri`) {
+ $rev = $1 if /Last Changed Rev:\ (\d+)/;
+ }
+ print $rev."\n";
+
my @control = getFile($uri."/debian/control");
return unless @control;
foreach (@control) {
@@ -95,7 +105,12 @@
}
}
+<<<<<<< .mine
+
$package->uri($uri);
+=======
+ $package->uri($uri);
+>>>>>>> .r2621
$package->tarballuri($tarballuri);
$package->rev($rev);
@@ -187,9 +202,15 @@
next if /branche/; # I want trunk !
next unless /debian\/control$/; # I want trunk !
my $rev = $t->{$_}->created_rev;
+<<<<<<< .mine
$uri =~ s/(|\/)debian\/control$//;
print "->".$uri."\n";
+ importPkg(\$repository,$uri,$tarballinrepository);
+=======
+ $uri =~ s/(|\/)debian\/control$//;
+ print "->".$uri."\n";
importPkg(\$repository,$uri,$rev, $tarballinrepository);
+>>>>>>> .r2621
}
}
More information about the Pkg-games-commits
mailing list