github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 11:44:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3183 from mat007/fix-windows

Browse Source 
Fix relative path under Windows
This commit is contained in:
Justin Cormack 2018-09-10 15:17:49 +01:00 committed by GitHub
commit 576eab21c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd/linuxkit/pkglib/build.go
View File

@ -6,10 +6,8 @@ import (
"fmt"
"io"
"os"
"path"
"path/filepath"
"runtime"
"strings"
"github.com/linuxkit/linuxkit/src/cmd/linuxkit/version"
log "github.com/sirupsen/logrus"
@ -235,7 +233,11 @@ func (c *buildCtx) Copy(w io.WriteCloser) error {
if err != nil {
return fmt.Errorf("ctx: Converting FileInfo for %s: %v", p, err)
}
h.Name = path.Join(s.dst, strings.TrimPrefix(p, s.src))
rel, err := filepath.Rel(s.src, p)
if err != nil {
return err
}
h.Name = filepath.ToSlash(filepath.Join(s.dst, rel))
if err := tw.WriteHeader(h); err != nil {
return fmt.Errorf("ctx: Writing header for %s: %v", p, err)
}