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

pkg/archive: adjust chmod bits on windows

Browse source 
This change modifies the chmod bits of build context archives built on
windows to preserve the execute bit and remove the r/w bits from
grp/others.

Also adjusted integ-cli tests to verify permissions based on the platform
the tests are running.

Fixes #11047.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
This commit is contained in:
Ahmet Alp Balkan 2015-03-03 18:40:16 -08:00
parent 2a627ca2f7
commit 276ed4fec4
5 changed files with 59 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
archive/archive.go
View file

@ -204,6 +204,7 @@ func (ta *tarAppender) addTarFile(path, name string) error {
if err != nil {
return err
}
hdr.Mode = int64(chmodTarEntry(os.FileMode(hdr.Mode)))
name, err = canonicalTarName(name, fi.IsDir())
if err != nil {
@ -696,6 +697,8 @@ func (archiver *Archiver) CopyFileWithTar(src, dst string) (err error) {
return err
}
hdr.Name = filepath.Base(dst)
hdr.Mode = int64(chmodTarEntry(os.FileMode(hdr.Mode)))
tw := tar.NewWriter(w)
defer tw.Close()
if err := tw.WriteHeader(hdr); err != nil {