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

weldr: allow running on unsupported distros

Browse source 
When the host distribution is not known or supported, instead of failing
with an error, print a warning to the log and initialise the API with
the architecture name and distro name.
This enables running the weldr API on unsupported distros for
cross-distro building.

Guards against a nil arch member when initialising the store.
This commit is contained in:
Achilleas Koutsou 2022-03-09 18:48:18 +01:00 • committed by Tom Gundersen
parent 3ab2725042
commit f9eb98b14d
2 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/store/json.go
View file

@ -378,6 +378,9 @@ func imageTypeToCompatString(imgType distro.ImageType) string {
}
func imageTypeFromCompatString(input string, arch distro.Arch) distro.ImageType {
if arch == nil {
return nil
}
for k, v := range imageTypeCompatMapping {
if v == input {
imgType, err := arch.GetImageType(k)

42
internal/weldr/api.go
View file

@ -48,6 +48,7 @@ type API struct {
rpmmd rpmmd.RPMMD
arch distro.Arch
archName string
repoRegistry *reporegistry.RepoRegistry
logger *log.Logger
@ -131,6 +132,7 @@ func NewTestAPI(rpm rpmmd.RPMMD, arch distro.Arch, dr *distroregistry.Registry,
workers: workers,
rpmmd: rpm,
arch: arch,
archName: arch.Name(),
repoRegistry: rr,
logger: logger,
compatOutputDir: compatOutputDir,
@ -150,29 +152,34 @@ func New(repoPaths []string, stateDir string, rpm rpmmd.RPMMD, dr *distroregistr
hostDistroName, _, _, err := distro.GetHostDistroName()
if err != nil {
return nil, fmt.Errorf("host distro is not supported")
return nil, fmt.Errorf("failed to read host distro information")
}
archName := common.CurrentArch()
hostDistro := dr.GetDistro(hostDistroName)
if hostDistro == nil {
return nil, fmt.Errorf("host distro is not supported")
}
hostArch, err := hostDistro.GetArch(archName)
if err != nil {
return nil, fmt.Errorf("Host distro does not support host architecture: %v", err)
}
rr, err := reporegistry.New(repoPaths)
if err != nil {
return nil, fmt.Errorf("error loading repository definitions: %v", err)
}
// Check if repositories for the host distro and arch were loaded
_, err = rr.ReposByArch(hostArch, false)
if err != nil {
return nil, fmt.Errorf("loaded repository definitions don't contain any for the host distro/arch: %v", err)
var hostArch distro.Arch
hostDistro := dr.GetDistro(hostDistroName)
if hostDistro != nil {
// get canonical distro name if the host distro is supported
hostDistroName = hostDistro.Name()
hostArch, err = hostDistro.GetArch(archName)
if err != nil {
return nil, fmt.Errorf("Host distro does not support host architecture: %v", err)
}
// Check if repositories for the host distro and arch were loaded
_, err = rr.ReposByArchName(hostDistroName, archName, false)
if err != nil {
log.Printf("loaded repository definitions don't contain any for the host distro/arch: %v", err)
}
} else {
log.Printf("host distro %q is not supported: only cross-distro builds are available", hostDistroName)
}
store := store.New(&stateDir, hostArch, logger)
@ -183,12 +190,13 @@ func New(repoPaths []string, stateDir string, rpm rpmmd.RPMMD, dr *distroregistr
workers: workers,
rpmmd: rpm,
arch: hostArch,
archName: archName,
repoRegistry: rr,
logger: logger,
compatOutputDir: compatOutputDir,
hostDistroName: hostDistro.Name(),
hostDistroName: hostDistroName,
distroRegistry: dr,
distros: validDistros(rr, dr, hostArch.Name(), logger),
distros: validDistros(rr, dr, archName, logger),
distrosImageTypeDenylist: distrosImageTypeDenylist,
}
return setupRouter(api), nil