From c6bb5f76f77ef63e471f762b8c855d5d0ca7e993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Sat, 21 Dec 2024 11:37:15 +0100 Subject: [PATCH] cmd filter: add comment and cleanup --- cmd/mirror_create.go | 5 +---- cmd/mirror_edit.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmd/mirror_create.go b/cmd/mirror_create.go index 9c4dbeeef..049dd2ebb 100644 --- a/cmd/mirror_create.go +++ b/cmd/mirror_create.go @@ -46,15 +46,12 @@ func aptlyMirrorCreate(cmd *commander.Command, args []string) error { return fmt.Errorf("unable to create mirror: %s", err) } - repo.Filter = context.Flags().Lookup("filter").Value.String() + repo.Filter = context.Flags().Lookup("filter").Value.String() // allows file/stdin with @ repo.FilterWithDeps = context.Flags().Lookup("filter-with-deps").Value.Get().(bool) repo.SkipComponentCheck = context.Flags().Lookup("force-components").Value.Get().(bool) repo.SkipArchitectureCheck = context.Flags().Lookup("force-architectures").Value.Get().(bool) if repo.Filter != "" { - if err != nil { - return fmt.Errorf("unable to read package query from file %s: %w", context.Flags().Lookup("filter").Value.String(), err) - } _, err = query.Parse(repo.Filter) if err != nil { return fmt.Errorf("unable to create mirror: %s", err) diff --git a/cmd/mirror_edit.go b/cmd/mirror_edit.go index 84c4f0b59..f95d97368 100644 --- a/cmd/mirror_edit.go +++ b/cmd/mirror_edit.go @@ -32,7 +32,7 @@ func aptlyMirrorEdit(cmd *commander.Command, args []string) error { context.Flags().Visit(func(flag *flag.Flag) { switch flag.Name { case "filter": - repo.Filter = flag.Value.String() + repo.Filter = flag.Value.String() // allows file/stdin with @ case "filter-with-deps": repo.FilterWithDeps = flag.Value.Get().(bool) case "with-installer":