From c1346ba6b7ee220940823487fa0c17d9bdf4f93a Mon Sep 17 00:00:00 2001 From: Brad Lugo Date: Mon, 24 Feb 2025 00:06:56 -0800 Subject: [PATCH] fixup! internal/rpm: new iterator-based rpm package Rename to NERVA to NEVRA --- internal/rpm/nerva.go | 20 -------------------- internal/rpm/nevra.go | 12 ++++++++++++ 2 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 internal/rpm/nerva.go create mode 100644 internal/rpm/nevra.go diff --git a/internal/rpm/nerva.go b/internal/rpm/nerva.go deleted file mode 100644 index 9933df2e7..000000000 --- a/internal/rpm/nerva.go +++ /dev/null @@ -1,20 +0,0 @@ -package rpm - -import ( - "strings" - - "github.com/quay/claircore" -) - -// NERVA returns an rpm NERVA for the package "p", assuming that the -// [Package.Version] is an EVR string. This should hold true for all -// [claircore.Package] instances returned by this package. -func NERVA(p *claircore.Package) string { - var b strings.Builder - b.WriteString(p.Name) - b.WriteByte('-') - b.WriteString(p.Version) - b.WriteByte('.') - b.WriteString(p.Arch) - return b.String() -} diff --git a/internal/rpm/nevra.go b/internal/rpm/nevra.go new file mode 100644 index 000000000..b9695e2af --- /dev/null +++ b/internal/rpm/nevra.go @@ -0,0 +1,12 @@ +package rpm + +import ( + "github.com/quay/claircore" +) + +// NEVRA returns an rpm NEVRA for the package "p", assuming that the +// [Package.Version] is an EVR string. This should hold true for all +// [claircore.Package] instances returned by this package. +func NEVRA(p *claircore.Package) string { + return p.Name + "-" + p.Version + "." + p.Arch +}