[Collab-qa-commits] r1189 - buildstat/trunk/buildstat-server/lib/SvnBuildStat/Controller

[goneri at alioth.debian.org]

Author: goneri
Date: 2008-09-01 13:08:12 +0000 (Mon, 01 Sep 2008)
New Revision: 1189

Modified:
   buildstat/trunk/buildstat-server/lib/SvnBuildStat/Controller/Controls.pm
Log:
add a temporary workaround to avoid the build of the package from debian repositories

Modified: buildstat/trunk/buildstat-server/lib/SvnBuildStat/Controller/Controls.pm
===================================================================
--- buildstat/trunk/buildstat-server/lib/SvnBuildStat/Controller/Controls.pm	2008-09-01 13:06:47 UTC (rev 1188)
+++ buildstat/trunk/buildstat-server/lib/SvnBuildStat/Controller/Controls.pm	2008-09-01 13:08:12 UTC (rev 1189)
@@ -39,8 +39,11 @@
 
     my $dbh = $c->model('DB')->storage->dbh;
     my $req = "
-        SELECT
-          changelogentry.id AS changelogentry_id
+
+
+
+      SELECT
+          vcs.name, changelogentry.id AS changelogentry_id
         FROM
           changelogentry
         LEFT JOIN
@@ -51,6 +54,14 @@
           repositoryentry
          ON
           changelogentry.id = repositoryentry.changelogentry_id
+        LEFT JOIN
+          repository
+         ON
+          repository.id = repositoryentry.repository_id
+        LEFT JOIN
+          vcs
+         ON
+          vcs.id = repository.vcs_id
         WHERE
           repositoryentry.".$params->{arch}." = true
          AND
@@ -71,7 +82,10 @@
     my $tobuild = $dbh->selectall_arrayref($req);
 
 
-    my $changelogentry_id = $tobuild->[0][0];
+    my $changelogentry_id = $tobuild->[0][1];
+    my $vcs_name = $tobuild->[0][0];
+    return if $vcs_name eq 'apt';
+
     die "Can't find a package to build" unless $changelogentry_id;
     my $changelogentry = $c->model('SvnBuildStat::Model::DB::Changelogentry')->search ({id => $changelogentry_id})->first;
 
@@ -85,6 +99,8 @@
     #my $repositoryuri = $c->config->{path}->{weburi}."/static/files";
     my $repositoryuri = "http://buildstat.debian.net/repository";
     $dscuri =~ s/\@REPOSITORY_URL@/$repositoryuri/;
+    # TODO
+    $dscuri =~ s/\@DEB_MIRROR\@/http:\/\/ftp.fr.debian.org\/debian/;
 
     # TODO create the qajob entry here!
 
@@ -183,8 +199,8 @@
     die unless $qajob;
 
 
-    my $repositoryuri = "http://buildstat.debian.net/repository";
-    $dscuri =~ s/\@REPOSITORY_URL@/$repositoryuri/;
+#    my $repositoryuri = "http://buildstat.debian.net/repository";
+#    $dscuri =~ s/\@REPOSITORY_URL@/$repositoryuri/;
     $ret .= "cookie=$cookie\n";