Skip to content

use proper path, not the abs path #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2016
Merged

use proper path, not the abs path #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions go/porcelain/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ type uploadError struct {
}

type file struct {
Name string
AbsPath string
SHA1 hash.Hash
Buffer *bytes.Buffer
Name string
SHA1 hash.Hash
Buffer *bytes.Buffer
}

func (f *file) Sum() string {
Expand Down Expand Up @@ -215,7 +214,7 @@ func (n *Netlify) uploadFile(ctx context.Context, d *models.Deploy, f *file, wg
}
sharedErr.mutex.Unlock()

params := operations.NewUploadDeployFileParams().WithDeployID(d.ID).WithPath(f.AbsPath).WithFileBody(f)
params := operations.NewUploadDeployFileParams().WithDeployID(d.ID).WithPath(f.Name).WithFileBody(f)
_, err := n.Operations.UploadDeployFile(params, authInfo)

if err != nil {
Expand Down Expand Up @@ -256,10 +255,9 @@ func walk(dir string) (*deployFiles, error) {
}

file := &file{
Name: rel,
AbsPath: path,
SHA1: sha1.New(),
Buffer: new(bytes.Buffer),
Name: rel,
SHA1: sha1.New(),
Buffer: new(bytes.Buffer),
}
m := io.MultiWriter(file.SHA1, file.Buffer)

Expand Down