kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #11189 from ahmetalpbalkan/win-cli/archive-path-separator

Browse source 
pkg/archive_windows: make use of os.PathSeparator
This commit is contained in:
Doug Davis 2015-03-05 22:25:20 -05:00
commit 2a8a2d2428
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/archive/archive_windows.go
View file

@ -4,6 +4,7 @@ package archive
import ( import (
"fmt" "fmt"
"os"
"strings" "strings"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "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, "/") { if strings.Contains(p, "/") {
return "", fmt.Errorf("windows path contains forward slash: %s", 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) { func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, stat interface{}) (nlink uint32, inode uint64, err error) {