dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-03 06:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31211 from lixiaobing10051267/masterAttach

Browse Source 
invalide detach keys provided
This commit is contained in:
Lei Jitang
2017-02-22 11:28:15 +08:00
committed by GitHub
parent 093867b9a6 660ec32e8f
commit ffc70d2f0c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/attach.go
View File

@@ -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)
}
}

2
integration-cli/docker_cli_run_unix_test.go
View File

@@ -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)
}