tools/out-of-tree
1
0
Fork 0
Code Releases Activity

feat: support matching several architectures

Browse Source
This commit is contained in:
dump_stack() 2023-05-14 11:38:41 +00:00
parent 6bb0da5082
commit fa23cdfc54
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
distro/debian/snapshot/snapshot.go
View File

@ -68,13 +68,14 @@ type Package struct {
} }
} }
func NewPackage(name, srcname, version, arch string) (p Package, err error) { func NewPackage(name, srcname, version string, archs []string) (
p Package, err error) {
p.Name = name p.Name = name
p.Source = srcname p.Source = srcname
p.Version = version p.Version = version
p.Arch = arch
p.Deb.Hash, err = p.getHash() p.Arch, p.Deb.Hash, err = p.getHash(archs)
if err != nil { if err != nil {
return return
} }
@ -110,18 +111,21 @@ func NewPackage(name, srcname, version, arch string) (p Package, err error) {
return return
} }
func (p Package) getHash() (hash string, err error) { func (p Package) getHash(archs []string) (arch, hash string, err error) {
binfiles, err := mr.GetBinfiles(p.Name, p.Version) binfiles, err := mr.GetBinfiles(p.Name, p.Version)
if err != nil { if err != nil {
return return
} }
for _, res := range binfiles.Result { for _, res := range binfiles.Result {
if res.Architecture == p.Arch { for _, allowedArch := range archs {
if res.Architecture == allowedArch {
arch = res.Architecture
hash = res.Hash hash = res.Hash
return return
} }
} }
}
err = errors.New("hash not found") err = errors.New("hash not found")
return return
@ -292,8 +296,8 @@ func filtered(s string, filter []string) bool {
return false return false
} }
func Packages(srcname, version, arch, regex string, func Packages(srcname, version, regex string, archs, filter []string) (
filter []string) (pkgs []Package, err error) { pkgs []Package, err error) {
binpkgs, err := mr.GetBinpackages(srcname, version) binpkgs, err := mr.GetBinpackages(srcname, version)
if err == mr.ErrNotFound { if err == mr.ErrNotFound {
@ -314,7 +318,7 @@ func Packages(srcname, version, arch, regex string,
log.Trace().Msgf("matched %v", res.Name) log.Trace().Msgf("matched %v", res.Name)
var pkg Package var pkg Package
pkg, err = NewPackage(res.Name, srcname, version, arch) pkg, err = NewPackage(res.Name, srcname, version, archs)
if err != nil { if err != nil {
return return
} }

6
distro/debian/snapshot/snapshot_test.go
View File

@ -19,9 +19,9 @@ func TestSourcePackageVersions(t *testing.T) {
} }
func TestPackages(t *testing.T) { func TestPackages(t *testing.T) {
packages, err := Packages("linux", "3.16.5-1", "amd64", rx := `^linux-(image|headers)-[0-9\.\-]*-(common|amd64|amd64-unsigned)$`
`^linux-(image|headers)-[0-9\.\-]*-(common|amd64|amd64-unsigned)$`, packages, err := Packages("linux", "3.16.5-1", rx,
[]string{}) []string{"amd64", "all"}, []string{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }