ALHP/ALHP.GO
6
42
Fork 9
Code Issues 25 Pull Requests Projects Releases Wiki Activity

minor code cleanup

Browse Source
This commit is contained in:
Giovanni Harting
2023-05-21 19:49:34 +02:00
parent e079526d4c
commit 2a7aef16a6
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildmanager.go
View File

@@ -109,7 +109,7 @@ func (b *BuildManager) buildQueue(queue []*ProtoPackage, ctx context.Context) er
go func(pkg *ProtoPackage) { go func(pkg *ProtoPackage) {
dur, err := pkg.build(ctx) dur, err := pkg.build(ctx)
if err != nil && !errors.Is(err, NotEligibleError) { if err != nil && !errors.Is(err, ErrorNotEligible) {
log.Warningf("[Q] error building package %s->%s in %s: %s", pkg.FullRepo, pkg.Pkgbase, dur, err) log.Warningf("[Q] error building package %s->%s in %s: %s", pkg.FullRepo, pkg.Pkgbase, dur, err)
b.repoPurge[pkg.FullRepo] <- []*ProtoPackage{pkg} b.repoPurge[pkg.FullRepo] <- []*ProtoPackage{pkg}
} else if err == nil { } else if err == nil {

7
ent/dbpackage/dbpackage.go
View File

@@ -137,9 +137,8 @@ type Repository string
// Repository values. // Repository values.
const ( const (
RepositoryExtra Repository = "extra" RepositoryExtra Repository = "extra"
RepositoryCore Repository = "core" RepositoryCore Repository = "core"
RepositoryCommunity Repository = "community"
) )
func (r Repository) String() string { func (r Repository) String() string {
@@ -149,7 +148,7 @@ func (r Repository) String() string {
// RepositoryValidator is a validator for the "repository" field enum values. It is called by the builders before save. // RepositoryValidator is a validator for the "repository" field enum values. It is called by the builders before save.
func RepositoryValidator(r Repository) error { func RepositoryValidator(r Repository) error {
switch r { switch r {
case RepositoryExtra, RepositoryCore, RepositoryCommunity: case RepositoryExtra, RepositoryCore:
return nil return nil
default: default:
return fmt.Errorf("dbpackage: invalid enum value for repository field: %q", r) return fmt.Errorf("dbpackage: invalid enum value for repository field: %q", r)

2
ent/migrate/schema.go
View File

@@ -15,7 +15,7 @@ var (
{Name: "packages", Type: field.TypeJSON, Nullable: true}, {Name: "packages", Type: field.TypeJSON, Nullable: true},
{Name: "status", Type: field.TypeEnum, Nullable: true, Enums: []string{"skipped", "failed", "build", "queued", "delayed", "building", "latest", "signing", "unknown"}, Default: "unknown"}, {Name: "status", Type: field.TypeEnum, Nullable: true, Enums: []string{"skipped", "failed", "build", "queued", "delayed", "building", "latest", "signing", "unknown"}, Default: "unknown"},
{Name: "skip_reason", Type: field.TypeString, Nullable: true}, {Name: "skip_reason", Type: field.TypeString, Nullable: true},
{Name: "repository", Type: field.TypeEnum, Enums: []string{"extra", "core", "community"}}, {Name: "repository", Type: field.TypeEnum, Enums: []string{"extra", "core"}},
{Name: "march", Type: field.TypeString}, {Name: "march", Type: field.TypeString},
{Name: "version", Type: field.TypeString, Nullable: true}, {Name: "version", Type: field.TypeString, Nullable: true},
{Name: "repo_version", Type: field.TypeString, Nullable: true}, {Name: "repo_version", Type: field.TypeString, Nullable: true},

2
ent/schema/dbpackage.go
View File

@@ -18,7 +18,7 @@ func (DBPackage) Fields() []ent.Field {
field.Enum("status").Values("skipped", "failed", "build", "queued", "delayed", "building", field.Enum("status").Values("skipped", "failed", "build", "queued", "delayed", "building",
"latest", "signing", "unknown").Default("unknown").Optional(), "latest", "signing", "unknown").Default("unknown").Optional(),
field.String("skip_reason").Optional(), field.String("skip_reason").Optional(),
field.Enum("repository").Values("extra", "core", "community"), field.Enum("repository").Values("extra", "core"),
field.String("march").NotEmpty().Immutable(), field.String("march").NotEmpty().Immutable(),
field.String("version").Optional(), field.String("version").Optional(),
field.String("repo_version").Optional(), field.String("repo_version").Optional(),

6
proto_package.go
View File

@@ -38,7 +38,7 @@ type ProtoPackage struct {
} }
var ( var (
NotEligibleError = errors.New("package is not eligible") ErrorNotEligible = errors.New("package is not eligible")
) )
func (p *ProtoPackage) isEligible(ctx context.Context) (bool, error) { func (p *ProtoPackage) isEligible(ctx context.Context) (bool, error) {
@@ -162,7 +162,7 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
} }
if !elig { if !elig {
return time.Since(start), NotEligibleError return time.Since(start), ErrorNotEligible
} }
log.Infof("[P] build starting: %s->%s->%s", p.FullRepo, p.Pkgbase, p.Version) log.Infof("[P] build starting: %s->%s->%s", p.FullRepo, p.Pkgbase, p.Version)
@@ -443,7 +443,7 @@ func (p *ProtoPackage) isAvailable(h *alpm.Handle) bool {
} else if len(p.DBPackage.Packages) > 0 { } else if len(p.DBPackage.Packages) > 0 {
pkg, err = dbs.FindSatisfier(p.DBPackage.Packages[0]) pkg, err = dbs.FindSatisfier(p.DBPackage.Packages[0])
} else { } else {
cmd := exec.Command("unbuffer", "pacsift", "--exact", "--base="+p.Pkgbase, "--repo="+p.Repo.String()) //nolint:gosec cmd := exec.Command("unbuffer", "pacsift", "--exact", "--base="+p.Pkgbase, "--repo="+p.Repo.String())
var res []byte var res []byte
res, err = cmd.CombinedOutput() res, err = cmd.CombinedOutput()
log.Debug(string(res)) log.Debug(string(res))