From 0e697ebe6eddc02b0fd2f35bf7bb4557b068be18 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Mon, 27 Jul 2015 11:01:26 -0400 Subject: [PATCH 1/2] api/client/build: typo in error Signed-off-by: Vincent Batts --- api/client/build.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/client/build.go b/api/client/build.go index 6dac4a3f39..f424e9b3f6 100644 --- a/api/client/build.go +++ b/api/client/build.go @@ -392,7 +392,7 @@ func getContextFromReader(r io.Reader, dockerfileName string) (absContextDir, re } if err := archive.Untar(buf, absContextDir, nil); err != nil { - return "", "", fmt.Errorf("unable to extract stdin to temporary context direcotry: %v", err) + return "", "", fmt.Errorf("unable to extract stdin to temporary context directory: %v", err) } return getDockerfileRelPath(absContextDir, dockerfileName) From 7b4e6fc47b5b4b25f74f12419005098478e16ce7 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Mon, 27 Jul 2015 11:29:28 -0400 Subject: [PATCH 2/2] *: s/direcotry/directory/g typo Signed-off-by: Vincent Batts --- integration-cli/docker_cli_cp_from_container_test.go | 2 +- integration-cli/docker_cli_cp_to_container_test.go | 2 +- pkg/archive/copy_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_cp_from_container_test.go b/integration-cli/docker_cli_cp_from_container_test.go index 14536ce859..3dc8bab195 100644 --- a/integration-cli/docker_cli_cp_from_container_test.go +++ b/integration-cli/docker_cli_cp_from_container_test.go @@ -427,7 +427,7 @@ func (s *DockerSuite) TestCpFromCaseH(c *check.C) { } } -// I. SRC specifies a direcotry's contents only and DST exists as a file. This +// I. SRC specifies a directory's contents only and DST exists as a file. This // should cause an error as it is not possible to overwrite a file with a // directory. func (s *DockerSuite) TestCpFromCaseI(c *check.C) { diff --git a/integration-cli/docker_cli_cp_to_container_test.go b/integration-cli/docker_cli_cp_to_container_test.go index 4179553d18..a924c56144 100644 --- a/integration-cli/docker_cli_cp_to_container_test.go +++ b/integration-cli/docker_cli_cp_to_container_test.go @@ -484,7 +484,7 @@ func (s *DockerSuite) TestCpToCaseH(c *check.C) { } } -// I. SRC specifies a direcotry's contents only and DST exists as a file. This +// I. SRC specifies a directory's contents only and DST exists as a file. This // should cause an error as it is not possible to overwrite a file with a // directory. func (s *DockerSuite) TestCpToCaseI(c *check.C) { diff --git a/pkg/archive/copy_test.go b/pkg/archive/copy_test.go index d0cfa18bd6..dd0b323626 100644 --- a/pkg/archive/copy_test.go +++ b/pkg/archive/copy_test.go @@ -565,7 +565,7 @@ func TestCopyCaseH(t *testing.T) { } } -// I. SRC specifies a direcotry's contents only and DST exists as a file. This +// I. SRC specifies a directory's contents only and DST exists as a file. This // should cause an error as it is not possible to overwrite a file with a // directory. func TestCopyCaseI(t *testing.T) {