tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-05 12:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #352 from docker/fix_error_cancel_logs

Browse Source 
Exit without error message if user canceled command
This commit is contained in:
Guillaume Tardif 2020-07-07 11:27:33 +02:00 committed by GitHub
commit efea5c8c83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/main.go
View File

@ -173,6 +173,11 @@ func main() {
ctx = store.WithContextStore(ctx, s) ctx = store.WithContextStore(ctx, s)
if err = root.ExecuteContext(ctx); err != nil { if err = root.ExecuteContext(ctx); err != nil {
//if user canceled request, simply exit without any error message
if errors.Is(ctx.Err(), context.Canceled) {
os.Exit(130)
}
// Context should always be handled by new CLI // Context should always be handled by new CLI
requiredCmd, _, _ := root.Find(os.Args[1:]) requiredCmd, _, _ := root.Find(os.Args[1:])
if requiredCmd != nil && isOwnCommand(requiredCmd) { if requiredCmd != nil && isOwnCommand(requiredCmd) {