github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #34402 from dims/update-sftp-package 

Automatic merge from submit-queue

Update sftp package

In support of #34328

Looks like some folks need:
4d0e916071
pull/6/head
Kubernetes Submit Queue 2016-10-10 22:36:25 -07:00 committed by GitHub
parent 1837914d8e ab68052424
commit 1aed75a052
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -1834,7 +1834,7 @@
}, },
{ {
"ImportPath": "github.com/pkg/sftp", "ImportPath": "github.com/pkg/sftp",
"Rev": "a71e8f580e3b622ebff585309160b1cc549ef4d2" "Rev": "4d0e916071f68db74f8a73926335f809396d6b42"
}, },
{ {
"ImportPath": "github.com/pmezard/go-difflib/difflib", "ImportPath": "github.com/pmezard/go-difflib/difflib",

7
vendor/github.com/pkg/sftp/client.go generated vendored
View File

@ -490,18 +490,13 @@ func (c *Client) Join(elem ...string) string { return path.Join(elem...) }
// is not empty. // is not empty.
func (c *Client) Remove(path string) error { func (c *Client) Remove(path string) error {
err := c.removeFile(path) err := c.removeFile(path)
switch err := err.(type) { if err, ok := err.(*StatusError); ok {
case *StatusError:
switch err.Code { switch err.Code {
// some servers, *cough* osx *cough*, return EPERM, not ENODIR. // some servers, *cough* osx *cough*, return EPERM, not ENODIR.
// serv-u returns ssh_FX_FILE_IS_A_DIRECTORY // serv-u returns ssh_FX_FILE_IS_A_DIRECTORY
case ssh_FX_PERMISSION_DENIED, ssh_FX_FAILURE, ssh_FX_FILE_IS_A_DIRECTORY: case ssh_FX_PERMISSION_DENIED, ssh_FX_FAILURE, ssh_FX_FILE_IS_A_DIRECTORY:
return c.removeDirectory(path) return c.removeDirectory(path)
default:
return err
} }
default:
return err
} }
return err return err
} }

1
vendor/github.com/pkg/sftp/server_statvfs_linux.go generated vendored
View File

@ -16,7 +16,6 @@ func statvfsFromStatfst(stat *syscall.Statfs_t) (*StatVFS, error) {
Files: stat.Files, Files: stat.Files,
Ffree: stat.Ffree, Ffree: stat.Ffree,
Favail: stat.Ffree, // not sure how to calculate Favail Favail: stat.Ffree, // not sure how to calculate Favail
Fsid: uint64(uint64(stat.Fsid.X__val[1])<<32 | uint64(stat.Fsid.X__val[0])), // endianness?
Flag: uint64(stat.Flags), // assuming POSIX? Flag: uint64(stat.Flags), // assuming POSIX?
Namemax: uint64(stat.Namelen), Namemax: uint64(stat.Namelen),
}, nil }, nil