r2632 - in people/goneri/SvnBuildStat-WWW: ! dirs' list truncated !
Gonéri Le Bouder
goneri-guest at alioth.debian.org
Thu May 3 00:00:55 UTC 2007
Author: goneri-guest
Date: 2007-05-03 00:00:52 +0000 (Thu, 03 May 2007)
New Revision: 2632
Modified:
people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/Schema.pm
people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Maintainers.pm
people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm
people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Root.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/script/svnbuildstat_import-new-report.pl
people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl
Log:
some minor improvments+ bug fixes+ indentation
Modified: people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/Schema.pm
===================================================================
--- people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/Schema.pm 2007-05-02 19:43:33 UTC (rev 2631)
+++ people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/Schema.pm 2007-05-03 00:00:52 UTC (rev 2632)
@@ -4,8 +4,8 @@
use base qw/DBIx::Class::Schema::Loader/;
__PACKAGE__->loader_options(
- relationships => 1,
- # debug => 1,
+ relationships => 1,
+ # debug => 1,
);
=head1 NAME
Modified: people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Maintainers.pm
===================================================================
--- people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Maintainers.pm 2007-05-02 19:43:33 UTC (rev 2631)
+++ people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Maintainers.pm 2007-05-03 00:00:52 UTC (rev 2632)
@@ -35,7 +35,7 @@
my $maintainer;
$c->stash->{maintainers} = [ $c->model('SvnBuildStat::WWW::Model::DB::Maintainer')->search(undef,{order_by=>"name"}) ];
-
+
$c->stash->{template} = 'maintainers/main.tt2';
}
Modified: people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm
===================================================================
--- people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm 2007-05-02 19:43:33 UTC (rev 2631)
+++ people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm 2007-05-03 00:00:52 UTC (rev 2632)
@@ -68,7 +68,7 @@
$c->stash->{packages} = [];
while (my $package = $package_rs->next) {
my $build = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search (
- {package_id => $package->id, isbuildinprogress => 'false'}, {order_by => 'rev ASC'})->first;
+ {package_id => $package->id, isbuildinprogress => 'false'}, {id => 'rev ASC'})->first;
my $needbuild = 1;
my $lintianerrcount;
@@ -79,14 +79,14 @@
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 (
- {build_id => $build->id})->count;
- }
+ $buildisok = 1 if $build->buildisok;
+ $needbuild = 0 if (($build->rev eq $package->rev) && $build->buildisok);
+ $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 (
+ {build_id => $build->id})->count;
+ }
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) {
@@ -95,23 +95,23 @@
push @{$c->stash->{packages}}, {
- name => $package->name,
- istarballpresent => $package->istarballpresent,
- isindebian => $package->isindebian,
- needbuild => $needbuild,
- lintianerrcount => $lintianerrcount,
- lindaerrcount => $lindaerrcount,
- bugcount => $bugcount,
- bugerror => $bugerror,
- buildisok => $buildisok,
- piupartsisok => $piupartsisok,
- isindebian => $package->isindebian,
- svndebrelease => $package->svndebrelease,
+ name => $package->name,
+ istarballpresent => $package->istarballpresent,
+ isindebian => $package->isindebian,
+ needbuild => $needbuild,
+ lintianerrcount => $lintianerrcount,
+ lindaerrcount => $lindaerrcount,
+ bugcount => $bugcount,
+ bugerror => $bugerror,
+ buildisok => $buildisok,
+ piupartsisok => $piupartsisok,
+ isindebian => $package->isindebian,
+ svndebrelease => $package->svndebrelease,
- };
-}
+ };
+ }
-$c->stash->{template} = 'packages/main.tt2';
+ $c->stash->{template} = 'packages/main.tt2';
}
@@ -126,6 +126,8 @@
return;
}
$c->stash->{package} = $package->name;
+ $c->stash->{bugpic} = $package->name;
+ $c->stash->{bugpic} =~ s!^(.)(.+)$!http://people.debian.org/~glandium/bts/$1/$1$2.png! ;
$c->stash->{istarballpresent} = $package->istarballpresent;
$c->stash->{isindebian} = $package->isindebian,
$c->stash->{tarballuri} = $package->tarballuri,
@@ -137,59 +139,60 @@
#############
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;
- $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 }
-}
+ my $bugerror;
+ my $bugwarning;
+ $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 }
+ }
##########
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 $error;
- $error = 1 if /^E/;
- push @{$c->stash->{lintians}}, { text => $_, error => $error };
- }
+foreach (split $/, $build->lintian_log) {
+my $error;
+$error = 1 if /^E/;
+push @{$c->stash->{lintians}}, { text => $_, error => $error };
+}
- foreach (split $/, $build->linda_log) {
- my $error;
- $error = 1 if /^E/;
- push @{$c->stash->{lindas}}, { text => $_, error => $error } ;
- }
+foreach (split $/, $build->linda_log) {
+my $error;
+$error = 1 if /^E/;
+push @{$c->stash->{lindas}}, { text => $_, error => $error } ;
+}
- $c->stash->{piupartsisok} = $build->piupartsisok;
+$c->stash->{piupartsisok} = $build->piupartsisok;
}
##############
my $build_rs = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search({package_id => $package->id, isbuildinprogress => 'false'},{order_by => "id DESC"});
my $cpt;
while (($cpt++ < 10) && (my $build = $build_rs->next)) {
- my $failedstep = "build";
- if (!$build->buildisok) {
- if ($build->checkoutisok) {
- $failedstep = "check out";
+my $failedstep = "build";
+if (!$build->buildisok) {
+if ($build->checkoutisok) {
+ $failedstep = "check out";
- } if ($build->downloadisok) {
- $failedstep = "download";
- }
+} if ($build->downloadisok) {
+ $failedstep = "download";
+}
}
push @{$c->stash->{builds}}, {
- id => $build->id,
- buildisok => $build->buildisok,
- rev => $build->rev,
- duration => $build->duration,
- arch => $build->arch_id->name,
- failedstep => $failedstep,
+ id => $build->id,
+ buildisok => $build->buildisok,
+ rev => $build->rev,
+ duration => $build->duration,
+ arch => $build->arch_id->name,
+ failedstep => $failedstep,
+ time => $build->time,
+ }
}
-}
@@ -217,8 +220,9 @@
my $package_rs = $c->model('SvnBuildStat::WWW::Model::DB::Package')->search ({istarballpresent => 'true'});
return unless $package_rs->count;
+ my $resp;
+ my $cpt = int rand (10);
while (my $package = $package_rs->next) {
- my $needBuild;
next unless $package->istarballpresent;
# Build needed?
@@ -233,13 +237,13 @@
$tarballuri =~ s/\@PACKAGE@/$package->name/;
$tarballuri =~ s/\@TARBALL@/$package->svndebrelease/;
- my $rev = $package->rev;
my $uri = $package->uri;
my $tarball = mkTarballFromPackage(\$package);
- $c->response->body("$name;$rev;$tarballuri;$tarball;$uri");
- last if (rand(10) == 5); # the poor man randomizer
+ $resp = "$name;$tarballuri;$tarball;$uri";
+ last unless $cpt--; # the poor man randomizer
}
+ $c->response->body($resp);
}
=head1 AUTHOR
Modified: people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Root.pm
===================================================================
--- people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Root.pm 2007-05-02 19:43:33 UTC (rev 2631)
+++ people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Root.pm 2007-05-03 00:00:52 UTC (rev 2632)
@@ -27,15 +27,15 @@
=cut
sub default : Private {
- my ( $self, $c, $email ) = @_;
+ my ( $self, $c, $email ) = @_;
- if ($email) {
- $email = "/$email";
- } else {
- $email = '';
- }
-
- $c->response->redirect($c->uri_for('/packages/list'));
+ if ($email) {
+ $email = "/$email";
+ } else {
+ $email = '';
+ }
+
+ $c->response->redirect($c->uri_for('/packages/list'));
}
=head2 end
Modified: people/goneri/SvnBuildStat-WWW/root/src/logs/build.tt2
===================================================================
--- people/goneri/SvnBuildStat-WWW/root/src/logs/build.tt2 2007-05-02 19:43:33 UTC (rev 2631)
+++ people/goneri/SvnBuildStat-WWW/root/src/logs/build.tt2 2007-05-03 00:00:52 UTC (rev 2632)
@@ -14,13 +14,8 @@
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 erridx -%]
<li><a href="#[% err.linenum %]">[% err.content %]</a></li>
Modified: people/goneri/SvnBuildStat-WWW/root/src/logs/piuparts.tt2
===================================================================
--- people/goneri/SvnBuildStat-WWW/root/src/logs/piuparts.tt2 2007-05-02 19:43:33 UTC (rev 2631)
+++ people/goneri/SvnBuildStat-WWW/root/src/logs/piuparts.tt2 2007-05-03 00:00:52 UTC (rev 2632)
@@ -9,13 +9,8 @@
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 erridx -%]
<li><a href="#[% err.linenum %]">[% err.content %]</a></li>
Modified: people/goneri/SvnBuildStat-WWW/root/src/packages/info.tt2
===================================================================
--- people/goneri/SvnBuildStat-WWW/root/src/packages/info.tt2 2007-05-02 19:43:33 UTC (rev 2631)
+++ people/goneri/SvnBuildStat-WWW/root/src/packages/info.tt2 2007-05-03 00:00:52 UTC (rev 2632)
@@ -14,7 +14,6 @@
[% END -%]
</table>
-<<<<<<< .mine
<h2>URI</h2>
<table>
<tr>
@@ -35,40 +34,13 @@
<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>
- [% 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 %]
-
-
->>>>>>> .r2621
[% IF bugs %]
<h2>Bugs</h2>
+<img src="[% bugpic %]" alt="bug graph"/>
<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>
@@ -80,20 +52,15 @@
</table>
[% END -%]
-
<h2>build</h2>
[% IF builds %]
<h2>Builds</h2>
<table>
- <tr><th>Status</th><th>Arch</th><th>Svn Rev.</th><th>Build duration</th></tr>
+ <tr><th>Status</th><th>Arch</th><th>Svn Rev.</th><th>Date</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 %]
@@ -108,6 +75,9 @@
<td>
[% build.rev %]
</td>
+ <td>
+ [% build.time %]
+ </td>
<td>
[% IF build.duration %][% build.duration %]s[% END %]
</td>
@@ -124,7 +94,6 @@
[% IF lintians %]
<h2>lintian</h2>
-<<<<<<< .mine
<table>
[% FOREACH lintian IN lintians %]
<tr>
@@ -134,22 +103,10 @@
</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>
@@ -159,17 +116,6 @@
</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-05-02 19:43:33 UTC (rev 2631)
+++ people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2 2007-05-03 00:00:52 UTC (rev 2632)
@@ -15,72 +15,45 @@
</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
[% ELSE %]
[% IF package.buildisok %]
- ok
- [% ELSE %]
+ ok
+ [% ELSE %]
failed
[% END %]
[% END %]
[% 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 %]">
[% 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 %]">
[% 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 %]">
[% 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 %]
@@ -88,19 +61,9 @@
</td>
<td>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
- [% IF package.isindebian %]Yes[% END %]
+ [% IF ! package.isindebian %]No[% END %]
</a>
</td>
-=======
- <td>
- [% IF package.isindebian %]
- Yes
- [% ELSE %]
- No
- [% END %]
- </a>
- </td>
->>>>>>> .r2621
</tr>
[% END -%]
</table>
Modified: people/goneri/SvnBuildStat-WWW/script/svnbuildstat_import-new-report.pl
===================================================================
--- people/goneri/SvnBuildStat-WWW/script/svnbuildstat_import-new-report.pl 2007-05-02 19:43:33 UTC (rev 2631)
+++ people/goneri/SvnBuildStat-WWW/script/svnbuildstat_import-new-report.pl 2007-05-03 00:00:52 UTC (rev 2632)
@@ -40,11 +40,14 @@
my $build_rs = $schema->resultset('Build');
# Park the locked package as being
foreach my $lockfile (@lockfile) {
- if ($lockfile =~ /.*\/(.+)_(\d+)_(.+)\.lock$/) {
+ 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});
@@ -87,10 +90,7 @@
$report{$logfile} .= $_ foreach (<TMP>);
close TMP;
} else {
- print STDERR "Failed to open $logfile\n";
- `cp $reporttarball $rejecteddir`;
- `rm -r $workdir/report`;
- next;
+ $report{$logfile} = undef;
}
}
@@ -120,7 +120,10 @@
($report{'stamp_build-end'}-$report{'stamp_build-start'});
$build->build_log ($report{'build.log'});
$build->lintian_log ($report{'lintian.log'});
+ $build->update;
+ $report{'linda.log'} =~ s/(.+The character ').+(' is forbidden.+)/$1 $2/g;
$build->linda_log ($report{'linda.log'});
+ $build->update;
$build->piuparts_log ($report{'piuparts.log'});
$build->lintian_release ($report{lintian_release});
$build->linda_release ($report{linda_release});
@@ -143,7 +146,7 @@
my $lintian= $schema->resultset('Lintian')->find_or_create(name => $_);
$lintian->iserror($iserror);
my $build_lintian =
- $build->create_related('build_lintians', {
+ $build->find_or_create_related('build_lintians', {
lintian_id => $lintian->id});
}
@@ -160,7 +163,7 @@
my $linda= $schema->resultset('Linda')->find_or_create(name => $_);
$linda->iserror($iserror);
my $build_linda =
- $build->create_related('build_lindas', {
+ $build->find_or_create_related('build_lindas', {
linda_id => $linda->id});
}
Modified: people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl
===================================================================
--- people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl 2007-05-02 19:43:33 UTC (rev 2631)
+++ people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl 2007-05-03 00:00:52 UTC (rev 2632)
@@ -46,11 +46,7 @@
}
sub importPkg {
-<<<<<<< .mine
my( $repository, $uri, $tarballinrepository) = @_;
-=======
- my( $repository, $uri, $rev, $tarballinrepository) = @_;
->>>>>>> .r2621
my @maintainer;
my $packagesrc;
@@ -105,15 +101,11 @@
}
}
-<<<<<<< .mine
$package->uri($uri);
-=======
- $package->uri($uri);
->>>>>>> .r2621
$package->tarballuri($tarballuri);
- $package->rev($rev);
+ $package->rev($rev) if $rev;
$package->repository_id($$repository);
foreach my $maintainer (@maintainer) {
@@ -149,7 +141,7 @@
my $res = $ua->request($req);
$$package->isindebian(1) if $res->is_success;
-# print "Looking for tarball :".$tarballuri."\n";
+ print "Looking for tarball :'".$tarballuri."'\n";
$req = HTTP::Request->new(HEAD => $tarballuri);
$res = $ua->request($req);
if ($res->is_success) {
@@ -201,16 +193,9 @@
# look for packages
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