vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #17732 from Microsoft/sjw/archive_access_time_fix

Browse source 
Fixing last access time on Windows to unblock python.
This commit is contained in:
David Calavera 2015-11-10 13:17:03 -08:00
commit d88f338f8c
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
archive/archive.go
View file

@ -407,19 +407,25 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, L
return err return err
} }
aTime := hdr.AccessTime
if aTime.Before(hdr.ModTime) {
// Last access time should never be before last modified time.
aTime = hdr.ModTime
}
// system.Chtimes doesn't support a NOFOLLOW flag atm // system.Chtimes doesn't support a NOFOLLOW flag atm
if hdr.Typeflag == tar.TypeLink { if hdr.Typeflag == tar.TypeLink {
if fi, err := os.Lstat(hdr.Linkname); err == nil && (fi.Mode()&os.ModeSymlink == 0) { if fi, err := os.Lstat(hdr.Linkname); err == nil && (fi.Mode()&os.ModeSymlink == 0) {
if err := system.Chtimes(path, hdr.AccessTime, hdr.ModTime); err != nil { if err := system.Chtimes(path, aTime, hdr.ModTime); err != nil {
return err return err
} }
} }
} else if hdr.Typeflag != tar.TypeSymlink { } else if hdr.Typeflag != tar.TypeSymlink {
if err := system.Chtimes(path, hdr.AccessTime, hdr.ModTime); err != nil { if err := system.Chtimes(path, aTime, hdr.ModTime); err != nil {
return err return err
} }
} else { } else {
ts := []syscall.Timespec{timeToTimespec(hdr.AccessTime), timeToTimespec(hdr.ModTime)} ts := []syscall.Timespec{timeToTimespec(aTime), timeToTimespec(hdr.ModTime)}
if err := system.LUtimesNano(path, ts); err != nil && err != system.ErrNotSupportedPlatform { if err := system.LUtimesNano(path, ts); err != nil && err != system.ErrNotSupportedPlatform {
return err return err
} }