particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro: use the new types in distro packages

Browse source 
Each distro is now represented by a strongly typed value but it can also
provide its name as a string.
This commit is contained in:
Martin Sehnoutka 2020-02-10 09:38:32 +01:00 • committed by Ondřej Budai
parent 80e01bb397
commit d02bac15fe
3 changed files with 46 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
internal/distro/fedora30/distro.go
View file

@ -2,6 +2,7 @@ package fedora30
import (
"errors"
"github.com/osbuild/osbuild-composer/internal/common"
"log"
"sort"
"strconv"
@ -40,7 +41,7 @@ type output struct {
Assembler func(uefi bool, size uint64) *pipeline.Assembler
}
const Name = "fedora-30"
const Distro = common.Fedora30
func New(confPaths []string) *Fedora30 {
const GigaByte = 1024 * 1024 * 1024
@ -50,15 +51,15 @@ func New(confPaths []string) *Fedora30 {
outputs: map[string]output{},
}
repoMap, err := rpmmd.LoadRepositories(confPaths, Name)
repoMap, err := rpmmd.LoadRepositories(confPaths, r.Name())
if err != nil {
log.Printf("Could not load repository data for %s: %s", Name, err.Error())
log.Printf("Could not load repository data for %s: %s", r.Name(), err.Error())
return nil
}
repos, exists := repoMap["x86_64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", Name, err.Error())
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", r.Name(), err.Error())
} else {
r.arches["x86_64"] = arch{
Name: "x86_64",
@ -74,7 +75,7 @@ func New(confPaths []string) *Fedora30 {
repos, exists = repoMap["aarch64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", Name, err.Error())
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", r.Name(), err.Error())
} else {
r.arches["aarch64"] = arch{
Name: "aarch64",
@ -298,7 +299,15 @@ func New(confPaths []string) *Fedora30 {
}
func (r *Fedora30) Name() string {
return Name
name, exists := Distro.ToString()
if !exists {
panic("Fatal error, hardcoded distro value in fedora30 package is not valid!")
}
return name
}
func (r *Fedora30) Distribution() common.Distribution {
return Distro
}
func (r *Fedora30) Repositories(arch string) []rpmmd.RepoConfig {