瀏覽代碼

invalide detach keys provided
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

lixiaobing10051267 8 年之前
父節點
當前提交
660ec32e8f
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      daemon/attach.go
  2. 1 1
      integration-cli/docker_cli_run_unix_test.go

+ 1 - 1
daemon/attach.go

@@ -22,7 +22,7 @@ func (daemon *Daemon) ContainerAttach(prefixOrName string, c *backend.ContainerA
 	if c.DetachKeys != "" {
 		keys, err = term.ToBytes(c.DetachKeys)
 		if err != nil {
-			return fmt.Errorf("Invalid escape keys (%s) provided", c.DetachKeys)
+			return fmt.Errorf("Invalid detach keys (%s) provided", c.DetachKeys)
 		}
 	}
 

+ 1 - 1
integration-cli/docker_cli_run_unix_test.go

@@ -229,7 +229,7 @@ func (s *DockerSuite) TestRunAttachDetachFromInvalidFlag(c *check.C) {
 		c.Fatal(err)
 	}
 	// it should print a warning to indicate the detach key flag is invalid
-	errStr := "Invalid escape keys (ctrl-A,a) provided"
+	errStr := "Invalid detach keys (ctrl-A,a) provided"
 	c.Assert(strings.TrimSpace(out), checker.Equals, errStr)
 }