obirvalger/distrobuilder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Integrate repositories handler function

Browse Source 
Signed-off-by: Daniele Rondina <geaaru@sabayonlinux.org>
Signed-off-by: Thomas Hipp <thomas.hipp@canonical.com>
This commit is contained in:
Daniele Rondina 2018-12-28 21:28:47 +01:00 committed by Thomas Hipp
parent d1e8bdc2d7
commit cbb9007f5d
No known key found for this signature in database
GPG Key ID: 993408D1137B7D51
3 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
distrobuilder/chroot.go
View File

@ -18,6 +18,20 @@ func managePackages(def shared.DefinitionPackages, actions []shared.DefinitionAc
return fmt.Errorf("Couldn't get manager")
}
// Handle repositories actions
if def.Repositories != nil && len(def.Repositories) > 0 {
if manager.RepoHandler == nil {
return fmt.Errorf("No repository handler present")
}
for _, repo := range def.Repositories {
err = manager.RepoHandler(repo)
if err != nil {
return fmt.Errorf("Error for repository %s: %s", repo.Name, err)
}
}
}
err = manager.Refresh()
if err != nil {
return err

7
managers/manager.go
View File

@ -19,9 +19,10 @@ type ManagerHooks struct {
// A Manager represents a package manager.
type Manager struct {
command string
flags ManagerFlags
hooks ManagerHooks
command string
flags ManagerFlags
hooks ManagerHooks
RepoHandler func(repoAction shared.DefinitionPackagesRepository) error
}
// Get returns a Manager specified by name.

24
shared/definition.go
View File

@ -8,10 +8,8 @@ import (
"strings"
"time"
lxd "github.com/lxc/lxd/shared"
lxdarch "github.com/lxc/lxd/shared/osarch"
"github.com/lxc/lxd/shared"
lxdarch "github.com/lxc/lxd/shared/osarch"
)
// A DefinitionPackagesSet is a set of packages which are to be installed
@ -22,12 +20,22 @@ type DefinitionPackagesSet struct {
Releases []string `yaml:"releases,omitempty"`
}
// A DefinitionPackagesRepository contains data of a specific repository
type DefinitionPackagesRepository struct {
Name string `yaml:"name"` // Name of the repository
URL string `yaml:"url"` // URL (may differ based on manager)
Type string `yaml:"type,omitempty"` // For distros that have more than one repository manager
Key string `yaml:"key,omitempty"` // GPG armored keyring
Releases []string `yaml:"release,omitmepty"` // Releases that this repo applies to
}
// A DefinitionPackages represents a package handler.
type DefinitionPackages struct {
Manager string `yaml:"manager"`
Update bool `yaml:"update,omitempty"`
Cleanup bool `yaml:"cleanup,omitempty"`
Sets []DefinitionPackagesSet `yaml:"sets,omitempty"`
Manager string `yaml:"manager"`
Update bool `yaml:"update,omitempty"`
Cleanup bool `yaml:"cleanup,omitempty"`
Sets []DefinitionPackagesSet `yaml:"sets,omitempty"`
Repositories []DefinitionPackagesRepository `yaml:"repositories,omitempty"`
}
// A DefinitionImage represents the image.
@ -337,7 +345,7 @@ func (d *Definition) GetRunnableActions(trigger string) []DefinitionAction {
continue
}
if len(action.Releases) > 0 && !lxd.StringInSlice(d.Image.Release, action.Releases) {
if len(action.Releases) > 0 && !shared.StringInSlice(d.Image.Release, action.Releases) {
continue
}