Merge pull request #12435 from mlschroe/master

[backend] fix cache handling for preinstall images
openSUSE · Apr 12, 2022 · f34159f · f34159f
2 parents eeb2dc4 + bdb1db4
commit f34159f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/backend/bs_worker b/src/backend/bs_worker
@@ -2136,10 +2136,9 @@ sub getpreinstallimage {
     unlink("$dir/$ifile");
 
     # check if the image is in the cache
-    my $cacheid;
-    my $cachefile;
+    my ($cacheid, $cachefile);
     if ($cachedir) {
-      my ($cacheid, $cachefile) = get_cachefile($bestimg->{'prpa'}, $bestimg->{'hdrmd5'});
+      ($cacheid, $cachefile) = get_cachefile($bestimg->{'prpa'}, $bestimg->{'hdrmd5'});
       my $cachefilemeta = readstr("$cachefile.meta", 1) || '';
       if ($cachefilemeta eq "$bestimg->{'hdrmd5'}  :preinstallimage\n") {
 	if (link_or_copy($cachefile, "$dir/$ifile")) {