Add --arch to melange index to skip packages with the wrong arch

pkg/cli/index.go

@@ -23,6 +23,7 @@ import (
 
 func Index() *cobra.Command {
 	var apkIndexFilename string
+	var expectedArch string
 	cmd := &cobra.Command{
 		Use:     "index",
 		Short:   "Creates a repository index from a list of package files",
@@ -32,13 +33,15 @@ func Index() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			options := []index.Option{
 				index.WithIndexFile(apkIndexFilename),
+				index.WithExpectedArch(expectedArch),
 				index.WithPackageFiles(args),
 			}
 
 			return IndexCmd(cmd.Context(), options...)
 		},
 	}
 	cmd.Flags().StringVarP(&apkIndexFilename, "output", "o", "APKINDEX.tar.gz", "Output generated index to FILE")
+	cmd.Flags().StringVarP(&expectedArch, "arch", "a", "", "Index only packages which match the expected architecture")
 	return cmd
 }
 

pkg/index/index.go

@@ -35,6 +35,7 @@ type Context struct {
 	MergeIndexFileFlag bool
 	SigningKey         string
 	Logger             *log.Logger
+	ExpectedArch       string
 }
 
 type Option func(*Context) error
@@ -86,6 +87,15 @@ func WithSigningKey(signingKey string) Option {
 	}
 }
 
+// WithExpectedArch sets the expected package architecture.  Any packages with
+// an unexpected architecture will not be indexed.
+func WithExpectedArch(expectedArch string) Option {
+	return func(ctx *Context) error {
+		ctx.ExpectedArch = expectedArch
+		return nil
+	}
+}
+
 func New(opts ...Option) (*Context, error) {
 	ctx := Context{
 		PackageFiles: []string{},
@@ -151,6 +161,13 @@ func (ctx *Context) GenerateIndex() error {
 
 			for _, pkg := range packages {
 				found := false
+
+				if ctx.ExpectedArch != "" && pkg.Arch != ctx.ExpectedArch {
+					ctx.Logger.Printf("WARNING: %s-%s: found unexpected architecture %s, expecting %s",
+						pkg.Name, pkg.Version, pkg.Arch, ctx.ExpectedArch)
+					continue
+				}
+
 				for _, p := range index.Packages {
 					if pkg.Name == p.Name && pkg.Version == p.Version {
 						found = true