From cc1b6678def51bd429835943728ec89f37ff7846 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 13 Feb 2018 01:56:51 +0100 Subject: restore ErrEZ --- cmd_sign.go | 1 + cmd_verify.go | 1 + main.go | 3 +++ 3 files changed, 5 insertions(+) diff --git a/cmd_sign.go b/cmd_sign.go index e4695ee..e56ecd9 100644 --- a/cmd_sign.go +++ b/cmd_sign.go @@ -47,6 +47,7 @@ func (m *signCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interfac var err error switch { case m.zip && m.embed: + log.Println(ErrEZ) f.Usage() return subcommands.ExitUsageError case m.zip: diff --git a/cmd_verify.go b/cmd_verify.go index 8152606..f1bc8c8 100644 --- a/cmd_verify.go +++ b/cmd_verify.go @@ -55,6 +55,7 @@ func (m *verifyCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interf var err error switch { case m.zip && m.embed: + log.Println(ErrEZ) f.Usage() return subcommands.ExitUsageError case m.zip: diff --git a/main.go b/main.go index 5d11c58..6a23c43 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,7 @@ package main import ( "context" + "errors" "flag" "log" "os" @@ -10,6 +11,8 @@ import ( "github.com/google/subcommands" ) +var ErrEZ = errors.New("can't combine -e and -z options") + func init() { log.SetFlags(0) log.SetPrefix(progName() + ": ") -- cgit v1.2.3