Merge pull request #9489 from sjamgade/ccache_compression

[backend] ccache archive no longer has .gz suffix
openSUSE · May 7, 2020 · 5ae481d · 5ae481d
2 parents 1526219 + 07042c2
commit 5ae481d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/backend/BSSched/PublishRepo.pm b/src/backend/BSSched/PublishRepo.pm
@@ -204,7 +204,7 @@ sub prpfinished {
     next if $all{'.preinstallimage'};
     my $debian = grep {/\.dsc$/} @all;
     my $nosourceaccess = $all{'.nosourceaccess'};
-    @all = grep {$_ ne '_ccache.tar.gz' && $_ ne 'history' && $_ ne 'logfile' && $_ ne 'rpmlint.log' && $_ ne '_statistics' && $_ ne '_buildenv' && $_ ne '_channel' && $_ ne 'meta' && $_ ne 'status' && $_ ne 'reason' && !/^\./} @all;
+    @all = grep {$_ ne '_ccache.tar' && $_ ne 'history' && $_ ne 'logfile' && $_ ne 'rpmlint.log' && $_ ne '_statistics' && $_ ne '_buildenv' && $_ ne '_channel' && $_ ne 'meta' && $_ ne 'status' && $_ ne 'reason' && !/^\./} @all;
     my $taken;
     for my $bin (@all) {
       next if $bin =~ /^::import::/;

diff --git a/src/backend/bs_repserver b/src/backend/bs_repserver
@@ -1010,7 +1010,7 @@ sub getbinarylist {
     @bins = grep {!/^::import::/} @bins if $cgi->{'noimport'};
     @bins = BSRepServer::Containertar::add_containers(@bins) if grep {/\.containerinfo$/} @bins;
     @bins = filtersources(@bins) if $cgi->{'nosource'} || -e "$reporoot/$prp/$arch/$packid/.nosourceaccess";
-    @bins = grep {$_ ne "_ccache.tar.gz"} @bins unless $cgi->{'withccache'};
+    @bins = grep {$_ ne "_ccache.tar"} @bins unless $cgi->{'withccache'};
     for (sort @bins) {
       next if %binaries && !$binaries{$_};
       if (/\.tar$/ && ! -e "$reporoot/$prp/$arch/$packid/$_") {
@@ -1036,7 +1036,7 @@ sub getbinarylist {
     my @bins = grep {/\.rpm$/ && !/^\./} ls("$reporoot/$prp/$arch/$packid");
     @bins = grep {!/^::import::/} @bins if $cgi->{'noimport'};
     @bins = filtersources(@bins) if $cgi->{'nosource'} || -e "$reporoot/$prp/$arch/$packid/.nosourceaccess";
-    @bins = grep {$_ ne "_ccache.tar.gz"} @bins unless $cgi->{'withccache'};
+    @bins = grep {$_ ne "_ccache.tar"} @bins unless $cgi->{'withccache'};
     for my $bin (sort @bins) {
       next if %binaries && !$binaries{$_};
       my ($lead, $sighdr, $hdr, $hdrmd5);
@@ -1068,7 +1068,7 @@ sub getbinarylist {
     my @bins = grep {$_ ne 'logfile' && $_ ne 'status' && $_ ne 'reason' && $_ ne 'history' && !/^\./} ls("$reporoot/$prp/$arch/$packid");
     @bins = grep {!/^::import::/} @bins if $cgi->{'noimport'};
     @bins = filtersources(@bins) if $cgi->{'nosource'} || -e "$reporoot/$prp/$arch/$packid/.nosourceaccess";
-    @bins = grep {$_ ne "_ccache.tar.gz"} @bins unless $cgi->{'withccache'};
+    @bins = grep {$_ ne "_ccache.tar"} @bins unless $cgi->{'withccache'};
     for my $bin (sort @bins) {
       next if %binaries && !$binaries{$bin};
       if ($bin =~ /\.rpm$/) {
@@ -1110,7 +1110,7 @@ sub getbinarylist {
   @bins = grep {!/^::import::/} @bins if $cgi->{'noimport'};
   @bins = BSRepServer::Containertar::add_containers(@bins) if grep {/\.containerinfo$/} @bins;
   @bins = filtersources(@bins) if $cgi->{'nosource'} || -e "$reporoot/$prp/$arch/$packid/.nosourceaccess";
-  @bins = grep {$_ ne "_ccache.tar.gz"} @bins unless $cgi->{'withccache'};
+  @bins = grep {$_ ne "_ccache.tar"} @bins unless $cgi->{'withccache'};
   my %md5sums;
   if ($cgi->{'withmd5'}) {
     if (-s "$reporoot/$prp/$arch/$packid/.checksums") {

diff --git a/src/backend/bs_worker b/src/backend/bs_worker
@@ -3902,8 +3902,8 @@ if ($buildinfo->{'followupfile'}) {
       next unless -s "$buildsrcdir/$f";
       BSUtil::cp("$buildsrcdir/$f", "$buildroot/.build.packages/OTHER/$f");
     }
-    if (-e "$buildsrcdir/_ccache.tar.gz") {
-      link_or_copy("$buildsrcdir/_ccache.tar.gz", "$buildroot/.build.packages/OTHER/_ccache.tar.gz") || die("ccache.tar.gz link_or_copy failed")
+    if (-e "$buildsrcdir/_ccache.tar") {
+      link_or_copy("$buildsrcdir/_ccache.tar", "$buildroot/.build.packages/OTHER/_ccache.tar") || die("_ccache.tar link_or_copy failed")
     }
   }
   # delete follow-up srcrpm