Merge pull request #12338 from mlschroe/master

[backend] fix thinko in last cross build changes
openSUSE · Mar 22, 2022 · 7f1e9c1 · 7f1e9c1
2 parents cf266a1 + 2e6e8ca
commit 7f1e9c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/backend/BSRepServer/Checker.pm b/src/backend/BSRepServer/Checker.pm
@@ -233,7 +233,8 @@ sub buildinfo {
   my ($eok, @edeps);
   if ($cross && !$handler) {
     $handler ||= $handlers{default};
-    my ($splitdeps, $eok, @edeps) = BSSched::BuildJob::Package::expand_sysroot($bconf, $ctx->{'subpacks'}->{$info->{'name'}}, $info);
+    my $splitdeps;
+    ($splitdeps, $eok, @edeps) = BSSched::BuildJob::Package::expand_sysroot($bconf, $ctx->{'subpacks'}->{$info->{'name'}}, $info);
     $info->{'split_hostdeps'} = $splitdeps;
   } else {
     $handler ||= $handlers{default};

diff --git a/src/backend/BSSched/Checker.pm b/src/backend/BSSched/Checker.pm
@@ -769,7 +769,8 @@ sub expandandsort {
     my ($eok, @edeps);
     my $handler = $handlers{$buildtype};
     if ($cross && !$handler) {
-      my ($splitdeps, $eok, @edeps) = BSSched::BuildJob::Package::expand_sysroot($bconf, $subpacks->{$info->{'name'}}, $info);
+      my $splitdeps;
+      ($splitdeps, $eok, @edeps) = BSSched::BuildJob::Package::expand_sysroot($bconf, $subpacks->{$info->{'name'}}, $info);
       $ctx->{'split_hostdeps'}->{$packid} = $splitdeps;
     } else {
       $handler ||= $handlers{default};