Merge pull request #15292 from adrianschroeter/productcompose

[backend] bs_publisher: support new media naming for slepool
openSUSE · Nov 30, 2023 · 4badee0 · 4badee0
2 parents ee8916b + 1352bab
commit 4badee0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/backend/bs_publish b/src/backend/bs_publish
@@ -1876,18 +1876,20 @@ sub mapslepool {
   my $p = $bin;
   if ($name eq 'nobuildid') {
     $p = "repo/$bin";
-    $p =~ s/-Build[\d\.]+-/-/;
+    $p =~ s/-Build[\d\.]+//;
   } elsif ($bin =~ /.*-Media1?(\.license|)$/) {
     $p = "$name$1";
-  } elsif ($bin =~ /-Media3$/) {
+  } elsif ($bin =~ /-Media3$/ || $bin =~ /-Debug$/) {
     $p = "${name}_debug";
+  } elsif ($bin =~ /-Source$/) {
+    $p = "${name}_source";
   } elsif ($bin =~ /-Media2$/) {
     my $rbin3 = $rbin;
     $rbin3 =~ s/2$/3/;
     if (-d "$rdir/$rbin3") {
-      $p = "${name}_source";	# 3 media available, 2 is source
+      $p = "${name}_source";   # 3 media available, 2 is source
     } else {
-      $p = "${name}_debug";	# source is on media 1, 2 is debug
+      $p = "${name}_debug";    # source is on media 1, 2 is debug
     }
   }
   $p .= $sbom;