TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: use errors.Is to check ff's wrapped flag errors

Browse Source 
And also check from its Parse method.

Change-Id: I18754920575254cb6858a16b7954e74aa16483a1
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-10-27 14:06:22 -07:00
parent 75de4e9cc2
commit 3b5ada1fd8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/tailscale/cli/cli.go
View File

@ -139,13 +139,16 @@ func Run(args []string) error {
} }
if err := rootCmd.Parse(args); err != nil { if err := rootCmd.Parse(args); err != nil {
if errors.Is(err, flag.ErrHelp) {
return nil
}
return err return err
} }
tailscale.TailscaledSocket = rootArgs.socket tailscale.TailscaledSocket = rootArgs.socket
err := rootCmd.Run(context.Background()) err := rootCmd.Run(context.Background())
if err == flag.ErrHelp { if errors.Is(err, flag.ErrHelp) {
return nil return nil
} }
return err return err