From f877b9ecc476fdc79e54cb41152ae00fad9b138a Mon Sep 17 00:00:00 2001 From: Benjamin Abbott-Scott Date: Sat, 4 Jul 2015 03:48:17 -0700 Subject: [PATCH] Return every time lock acquisition fails --- command/lock.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/command/lock.go b/command/lock.go index 51b5e2d163..d8c9cabb61 100644 --- a/command/lock.go +++ b/command/lock.go @@ -138,8 +138,12 @@ func (c *LockCommand) Run(args []string) int { c.Ui.Info("Attempting lock acquisition") } lockCh, err := lu.lockFn(c.ShutdownCh) - if err != nil || lockCh == nil { - c.Ui.Error(fmt.Sprintf("Lock acquisition failed: %s", err)) + if lockCh == nil { + if err == nil { + c.Ui.Error("Shutdown triggered during lock acquisition") + } else { + c.Ui.Error(fmt.Sprintf("Lock acquisition failed: %s", err)) + } return 1 }