aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2018-02-13 01:56:51 +0100
committerDimitri Sokolyuk <demon@dim13.org>2018-02-13 01:56:51 +0100
commitcc1b6678def51bd429835943728ec89f37ff7846 (patch)
treebaef8275b634fa4faec26e8290d146487710e538
parentfd59a93e542e0fbde65f8595adcbfa98eca68e09 (diff)
restore ErrEZ
-rw-r--r--cmd_sign.go1
-rw-r--r--cmd_verify.go1
-rw-r--r--main.go3
3 files changed, 5 insertions, 0 deletions
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() + ": ")