Merge pull request #1080 from zendesk/master

Return every time lock acquisition fails
hashicorp · Jul 22, 2015 · cfa7ed7 · cfa7ed7
2 parents 3e9e575 + f877b9e
commit cfa7ed7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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
 	}