[backend] fix cpeid handling in the tracker cache

The current code could not work as the cpeid was never written into the tracker cache.
openSUSE · Nov 7, 2019 · 2204bb2 · 2204bb2
1 parent 82ca59d
commit 2204bb2
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/backend/bs_publish b/src/backend/bs_publish
@@ -82,6 +82,8 @@ my $binsufsre = join('|', map {"\Q$_\E"} @binsufs);
 my @binsufsrsync = map {"--include=*.$_"} @binsufs;
 my $binarchs = join("|", keys(%BSCando::knownarch));
 
+my $trackercacheversion = 2;
+
 my $testmode;
 
 # convert hooks with filenames to real code refs
@@ -2321,7 +2323,7 @@ sub publish {
   my $packtrackcache;
   if (-s "$reporoot/$prp/:repoinfo") {
     $oldrepoinfo = BSUtil::retrieve("$reporoot/$prp/:repoinfo");
-    $packtrackcache = $oldrepoinfo->{'trackercache'} if $oldrepoinfo->{'trackercache'} && ($oldrepoinfo->{'trackercacheversion'} || '') eq '1';
+    $packtrackcache = $oldrepoinfo->{'trackercache'} if $oldrepoinfo->{'trackercache'} && ($oldrepoinfo->{'trackercacheversion'} || '') eq $trackercacheversion;
     $publishid = $oldrepoinfo->{'publishid'} + 1 if $oldrepoinfo->{'publishid'};
   }
   $publishid ||= $starttime;
@@ -2383,7 +2385,7 @@ sub publish {
 	next unless @s;
 	my $c = $cache{"$bin/$s[9]/$s[7]/$s[1]"};
 	if ($c) {
-	  my @d = qw{arch name epoch version release disturl buildtime provides};
+	  my @d = qw{arch name epoch version release disturl buildtime cpeid};
 	  $res = {};
 	  for (@$c) {
 	    my $dd = shift @d;
@@ -2394,6 +2396,12 @@ sub publish {
             $res = Build::query("$extrep/$bin", 'evra' => 1, 'buildtime' => 1, 'disturl' => 1);
 	  };
 	  next unless $res;
+          # catch provided product cpeid strings
+	  my ($cpeid) = grep {/^product-cpeid\(\)/} @{$res->{'provides'} || []};
+	  if ($cpeid) {
+	    $cpeid =~ s/.* = //;
+	    $res->{'cpeid'} = BSHTTP::urldecode($cpeid);
+	  }
 	}
 	my $pt = { 'project' => $projid, 'repository' => $repoid };
 	$pt->{'arch'} = $1 if $bins{$bin} =~ /^\Q$reporoot\E\/\Q$prp\E\/([^\/]+)\//;
@@ -2404,11 +2412,7 @@ sub publish {
 	$pt->{'binaryarch'} = $res->{'arch'} if defined $res->{'arch'};
 	$pt->{'binaryid'} = $res->{'hdrmd5'} if defined $res->{'hdrmd5'};
 	$pt->{'id'} = "$bin/$s[9]/$s[7]/$s[1]";
-        # catch provided product cpeid strings
-        if (my ($cpeid) = grep {$_ =~ m/^product-cpeid\(\)/} @{$res->{"provides"}}) {
-          $cpeid =~ s/.* = //;
-          $pt->{'cpeid'} = BSHTTP::urldecode($cpeid);
-        }
+	$pt->{'cpeid'} = $res->{'cpeid'} if $res->{'cpeid'};
 	$packtrack->{$bin} = $pt;
 	if ($pt->{'arch'}) {
 	  $reportfile = $bin;
@@ -2779,12 +2783,12 @@ publishprog_done:
     my @newcache;
     for my $pt (values %$packtrack) {
       my $id = delete $pt->{'id'};
-      push @newcache, $id, [ map {$pt->{$_ eq 'arch' ? 'binaryarch' : $_}} qw{arch name epoch version release disturl buildtime} ] if $id;
+      push @newcache, $id, [ map {$pt->{$_ eq 'arch' ? 'binaryarch' : $_}} qw{arch name epoch version release disturl buildtime cpeid} ] if $id;
     }
     $repoinfo = BSUtil::retrieve("$reporoot/$prp/:repoinfo", 1) || {};
     if (%$repoinfo) {
       $repoinfo->{'trackercache'} = \@newcache;
-      $repoinfo->{'trackercacheversion'} = '1';
+      $repoinfo->{'trackercacheversion'} = $trackercacheversion;
       BSUtil::store("$reporoot/$prp/.:repoinfo", "$reporoot/$prp/:repoinfo", $repoinfo);
       @newcache = ();	# free mem
       undef $repoinfo;	# free mem