[backend] getbinarylist: do not check arch in interconnect mode

openSUSE · Dec 5, 2012 · 97755de · 97755de
1 parent f2bca7d
commit 97755de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/backend/bs_repserver b/src/backend/bs_repserver
@@ -462,7 +462,7 @@ sub getbinarylist_repository {
     my $fd = gensym;
     if (open($fd, '<', "$reporoot/$prp/$arch/:full.solv")) {
       push @files, { 'name' => 'repositorysolv', 'filename' => $fd };
-    } else {
+    } elsif (-d "$reporoot/$prp/$arch") {
       my $pool = BSSolv::pool->new();
       my $repo = addrepo_scan($pool, $prp, $arch);
       if ($repo) {

diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver
@@ -5325,12 +5325,13 @@ sub getpackagelist_build {
 sub getbinarylist {
   my ($cgi, $projid, $repoid, $arch, $packid) = @_;
 
-  my $proj = checkprojrepoarch($projid, $repoid, $arch, 1);
   my $view = $cgi->{'view'};
   my @args;
   push @args, "view=$view" if $view;
   push @args, map {"binary=$_"} @{$cgi->{'binary'} || []};
   if ($view && ($view eq 'cache' || $view eq 'cpio' || $view eq 'solv' || $view eq 'solvstate')) {
+    # do not check arch in interconnect mode
+    my $proj = checkprojrepoarch($projid, $repoid, undef, 1);
     if (!$BSStdServer::isajax) {
       BSHandoff::handoff($ajaxsocket, "/build/$projid/$repoid/$arch/$packid", undef, @args);
       exit(0);
@@ -5347,6 +5348,7 @@ sub getbinarylist {
     BSWatcher::rpc($param, undef, @args);
     return undef;
   }
+  my $proj = checkprojrepoarch($projid, $repoid, $arch, 1);
   my $param = {
     'uri' => "$BSConfig::reposerver/build/$projid/$repoid/$arch/$packid",
   };