distro: don't use a global variable to store the distro register

Introduce a DistroRegister object. For now this does not introduce
any functional changes, as the object is always instantited to be
the same. However, in follow-up patches it will get options.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2019-12-19 13:47:07 +01:00
parent 6c49560479
commit 5fcdd4bea5
11 changed files with 59 additions and 40 deletions

View file

@ -66,7 +66,6 @@ func createBaseStoreFixture() *store.Store {
var date = time.Date(2019, 11, 27, 13, 19, 0, 0, time.FixedZone("UTC+1", 60*60))
var localTarget = &target.Target{
Uuid: uuid.MustParse("20000000-0000-0000-0000-000000000000"),
Name: "org.osbuild.local",
@ -93,7 +92,8 @@ func createBaseStoreFixture() *store.Store {
},
}
d := distro.New("fedora-30")
distros := distro.NewRegistry()
d := distros.GetDistro("fedora-30")
s := store.New(nil, d)
s.Blueprints[bName] = b
@ -166,7 +166,8 @@ func createStoreWithoutComposesFixture() *store.Store {
Customizations: nil,
}
d := distro.New("fedora-30")
distros := distro.NewRegistry()
d := distros.GetDistro("fedora-30")
s := store.New(nil, d)
s.Blueprints[bName] = b
@ -247,7 +248,7 @@ func BadDepsolve() Fixture {
func BadFetch() Fixture {
return Fixture{
fetchPackageList{
ret: nil,
ret: nil,
checksums: nil,
err: &rpmmd.DNFError{
Kind: "FetchError",