Merge pull request #34745 from simonferquel/fix-pkg-archive-conversion

Re-enable some conversion for darwin-amd64 platform
This commit is contained in:
Yong Tang 2017-09-06 09:00:29 -07:00 committed by GitHub
commit 945d80cd6a

View file

@ -50,8 +50,8 @@ func setHeaderForSpecialDevice(hdr *tar.Header, name string, stat interface{}) (
// Currently go does not fill in the major/minors
if s.Mode&unix.S_IFBLK != 0 ||
s.Mode&unix.S_IFCHR != 0 {
hdr.Devmajor = int64(major(s.Rdev))
hdr.Devminor = int64(minor(s.Rdev))
hdr.Devmajor = int64(major(uint64(s.Rdev))) // nolint: unconvert
hdr.Devminor = int64(minor(uint64(s.Rdev))) // nolint: unconvert
}
}