From 8ba64b383dee8827c70f9c0a0d71aa61d0f0c595 Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Thu, 5 Mar 2015 17:15:11 -0800 Subject: [PATCH] pkg/archive_windows: make use of os.PathSeparator cc: @jhowardmsft Signed-off-by: Ahmet Alp Balkan --- pkg/archive/archive_windows.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/archive/archive_windows.go b/pkg/archive/archive_windows.go index b95aa178d4..926d480217 100644 --- a/pkg/archive/archive_windows.go +++ b/pkg/archive/archive_windows.go @@ -4,6 +4,7 @@ package archive import ( "fmt" + "os" "strings" "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" @@ -20,7 +21,8 @@ func CanonicalTarNameForPath(p string) (string, error) { if strings.Contains(p, "/") { return "", fmt.Errorf("windows path contains forward slash: %s", p) } - return strings.Replace(p, "\\", "/", -1), nil + return strings.Replace(p, string(os.PathSeparator), "/", -1), nil + } func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, stat interface{}) (nlink uint32, inode uint64, err error) {