p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6493 from vieux/fix_cp_mac_os

Browse Source 
allow utimes on mac os, only lutimes isn't supported
Upstream-commit: abda245ddc38200b6ad24f79d194e6f4125a0100
Component: engine
This commit is contained in:
Michael Crosby
2014-06-19 14:00:59 -07:00
parent b7d9a978a2 2784f63639
commit 5d2f394b9a
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/archive/archive.go
View File

@ -262,11 +262,11 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, L
ts := []syscall.Timespec{timeToTimespec(hdr.AccessTime), timeToTimespec(hdr.ModTime)}
// syscall.UtimesNano doesn't support a NOFOLLOW flag atm, and
if hdr.Typeflag != tar.TypeSymlink {
if err := system.UtimesNano(path, ts); err != nil {
if err := system.UtimesNano(path, ts); err != nil && err != system.ErrNotSupportedPlatform {
return err
}
} else {
if err := system.LUtimesNano(path, ts); err != nil {
if err := system.LUtimesNano(path, ts); err != nil && err != system.ErrNotSupportedPlatform {
return err
}
}

11
components/engine/pkg/system/utimes_darwin.go Normal file
View File

@ -0,0 +1,11 @@
package system
import "syscall"
func LUtimesNano(path string, ts []syscall.Timespec) error {
return ErrNotSupportedPlatform
}
func UtimesNano(path string, ts []syscall.Timespec) error {
return syscall.UtimesNano(path, ts)
}

5
components/engine/pkg/system/utimes_linux.go
View File

@ -24,8 +24,5 @@ func LUtimesNano(path string, ts []syscall.Timespec) error {
}
func UtimesNano(path string, ts []syscall.Timespec) error {
if err := syscall.UtimesNano(path, ts); err != nil {
return err
}
return nil
return syscall.UtimesNano(path, ts)
}

2
components/engine/pkg/system/utimes_unsupported.go
View File

@ -1,4 +1,4 @@
// +build !linux,!freebsd
// +build !linux,!freebsd,!darwin
package system