Merge pull request #7929 from mlschroe/master

[backend] fix publishing of containers when no registry is configured
openSUSE · Jul 17, 2019 · 02d5f76 · 02d5f76
2 parents 36bda08 + 294d0c0
commit 02d5f76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/backend/BSPublisher/Container.pm b/src/backend/BSPublisher/Container.pm
@@ -280,9 +280,9 @@ sub upload_all_containers {
   }
   for my $pp (sort keys %allrefs_pp_lastp) {
     mkdir_p($extrep);
-    unlink("$extrep/$pp");
     unlink("$extrep/$pp.registry.txt");
     if (@{$allrefs_pp{$pp} || []}) {
+      unlink("$extrep/$pp");
       # write readme file where to find the container
       my @r = sort(BSUtil::unify(@{$allrefs_pp{$pp}}));
       my $readme = "This container can be pulled via:\n";
@@ -291,6 +291,7 @@ sub upload_all_containers {
       writestr("$extrep/$pp.registry.txt", undef, $readme);
     } elsif ($multicontainer && $allrefs_pp_lastp{$pp} ne $pp) {
       # create symlink to last arch
+      unlink("$extrep/$pp");
       symlink("$allrefs_pp_lastp{$pp}", "$extrep/$pp");
     }
   }

diff --git a/src/backend/bs_publish b/src/backend/bs_publish
@@ -2128,6 +2128,7 @@ sub publish {
       } else {
         print "      + $p\n";
       }
+      $containerinfo->{'blobdir'} = $blobdir if $blobdir;
       BSPublisher::Container::reconstruct_container($containerinfo, "$extrep/$p");
       my @s = stat("$extrep/$p");
       $bins{$p} = undef;