Move version correction to gen_purl subroutine

openSUSE · Nov 27, 2024 · 542b23b · 542b23b
1 parent 537b21a
commit 542b23b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Build/IntrospectGolang.pm b/Build/IntrospectGolang.pm
@@ -168,8 +168,6 @@ sub buildinfo  {
   my ($fh) = @_;
   my ($vers, $mod) = rawbuildinfo($fh);
   return undef unless defined $vers;
-  $vers =~ s/^go(.*)/$1/;
-
   my $buildinfo = { 'goversion' => $vers };
   my $lastmod;
   for my $l (split("\n", $mod || '')) {

diff --git a/generate_sbom b/generate_sbom
@@ -618,6 +618,7 @@ sub gen_purl {
   my ($p, $distro, $pkgtype) = @_;
   my $name = $p->{'NAME'};
   my $vr = $p->{'VERSION'};
+  $vr =~ s/^go// if $pkgtype eq 'golang' && $name eq 'stdlib';
   my $purltype = $pkgtype eq 'rust' ? 'cargo' : $pkgtype;
   my $subpath;
   if ($pkgtype eq 'golang' && $name =~ /\A([^\/]+\/[^\/]+\/[^\/]+)\/(.+)/s) {