diff --git a/buildmanager.go b/buildmanager.go index 1e1bad7..ddb6a4d 100644 --- a/buildmanager.go +++ b/buildmanager.go @@ -109,7 +109,7 @@ func (b *BuildManager) buildQueue(queue []*ProtoPackage, ctx context.Context) er go func(pkg *ProtoPackage) { 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) b.repoPurge[pkg.FullRepo] <- []*ProtoPackage{pkg} } else if err == nil { diff --git a/ent/dbpackage/dbpackage.go b/ent/dbpackage/dbpackage.go index a80d8b3..33e48e2 100644 --- a/ent/dbpackage/dbpackage.go +++ b/ent/dbpackage/dbpackage.go @@ -137,9 +137,8 @@ type Repository string // Repository values. const ( - RepositoryExtra Repository = "extra" - RepositoryCore Repository = "core" - RepositoryCommunity Repository = "community" + RepositoryExtra Repository = "extra" + RepositoryCore Repository = "core" ) 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. func RepositoryValidator(r Repository) error { switch r { - case RepositoryExtra, RepositoryCore, RepositoryCommunity: + case RepositoryExtra, RepositoryCore: return nil default: return fmt.Errorf("dbpackage: invalid enum value for repository field: %q", r) diff --git a/ent/migrate/schema.go b/ent/migrate/schema.go index 88223d7..162221a 100644 --- a/ent/migrate/schema.go +++ b/ent/migrate/schema.go @@ -15,7 +15,7 @@ var ( {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: "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: "version", Type: field.TypeString, Nullable: true}, {Name: "repo_version", Type: field.TypeString, Nullable: true}, diff --git a/ent/schema/dbpackage.go b/ent/schema/dbpackage.go index e2725e6..9d97cf5 100644 --- a/ent/schema/dbpackage.go +++ b/ent/schema/dbpackage.go @@ -18,7 +18,7 @@ func (DBPackage) Fields() []ent.Field { field.Enum("status").Values("skipped", "failed", "build", "queued", "delayed", "building", "latest", "signing", "unknown").Default("unknown").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("version").Optional(), field.String("repo_version").Optional(), diff --git a/proto_package.go b/proto_package.go index 18b607a..1e2505e 100644 --- a/proto_package.go +++ b/proto_package.go @@ -38,7 +38,7 @@ type ProtoPackage struct { } var ( - NotEligibleError = errors.New("package is not eligible") + ErrorNotEligible = errors.New("package is not eligible") ) 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 { - return time.Since(start), NotEligibleError + return time.Since(start), ErrorNotEligible } 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 { pkg, err = dbs.FindSatisfier(p.DBPackage.Packages[0]) } 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 res, err = cmd.CombinedOutput() log.Debug(string(res))