[Collab-qa-commits] r799 - svnbuildstat/trunk/lib/SvnBuildStat/Controller

[goneri at alioth.debian.org]

Author: goneri
Date: 2008-04-18 23:17:00 +0000 (Fri, 18 Apr 2008)
New Revision: 799

Modified:
   svnbuildstat/trunk/lib/SvnBuildStat/Controller/Controls.pm
Log:
clean up

Modified: svnbuildstat/trunk/lib/SvnBuildStat/Controller/Controls.pm
===================================================================
--- svnbuildstat/trunk/lib/SvnBuildStat/Controller/Controls.pm	2008-04-18 23:12:30 UTC (rev 798)
+++ svnbuildstat/trunk/lib/SvnBuildStat/Controller/Controls.pm	2008-04-18 23:17:00 UTC (rev 799)
@@ -10,6 +10,11 @@
 use SvnBuildStat::Common;
 use File::Glob qw/:glob/;
 
+my $archs = "(i386|m68k|sparc|alpha|powerpc|".
+        "arm|mips|mipsel|hppa|ia64|s390|amd64|".
+        "ppc64|sh|armeb|m32r|hurd-i386|kfreebsd-gnu)";
+
+
 sub loadInfofile {
     my $infofile = shift;
 
@@ -44,9 +49,6 @@
 sub getBuildJob : Local {
     my ( $self, $c, $param ) = @_;
 
-    my $archs = "(i386|m68k|sparc|alpha|powerpc|".
-        "arm|mips|mipsel|hppa|ia64|s390|amd64|".
-        "ppc64|sh|armeb|m32r|hurd-i386|kfreebsd-gnu)";
 
     my @uploadedFiles;
     my $uploaddir = $c->config->{path}->{uploaddir};
@@ -60,7 +62,7 @@
 
     }
 
-    if (!(defined ($params->{arch}) && $params->{arch} =~ /$archs/)) {
+    if (!(defined ($params->{arch}) && $params->{arch} =~ /($archs)/)) {
         die "unspported arch";
     }
 
@@ -145,7 +147,7 @@
 
 
 # TODO purge the files
-sub sendFile : Local {
+sub buildInput : Local {
     my ( $self, $c, $param ) = @_;
 
     my @uploadedFiles;
@@ -217,7 +219,7 @@
         my @localfile;
         foreach (($infofile->{logfile}, split(' ', $infofile->{files}))) {
         print STDERR $_."\n";
-            if (/^(\S+?)_\S+?_(amd64|i386|all|sparc|powerpc)\.deb/) {# TODO extend
+            if (/^(\S+?)_\S+?_($archs)\.deb/) {
                 my $deb = $c->model('SvnBuildStat::Model::DB::Deb')->find_or_create(name => $1);
                 my $arch = $c->model('SvnBuildStat::Model::DB::Arch')->find_or_create(name => $2);
                 my $build_deb = $c->model('SvnBuildStat::Model::DB::BuildDeb')->find_or_create(