alexvanin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

ftp: stop rmdir being recursive

Browse source
This commit is contained in:
Nick Craig-Wood 2017-05-18 15:52:28 +01:00
parent 3136a75f4d
commit 6cc783f20b
1 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ftp/ftp.go
View file

@ -414,27 +414,9 @@ func (f *Fs) Mkdir(dir string) (err error) {
// //
// Return an error if it doesn't exist or isn't empty // Return an error if it doesn't exist or isn't empty
func (f *Fs) Rmdir(dir string) error { func (f *Fs) Rmdir(dir string) error {
// This is actually a recursive remove directory
c, err := f.getFtpConnection() c, err := f.getFtpConnection()
if err != nil { if err != nil {
return errors.Wrap(err, "Rmdir") return errors.Wrap(translateErrorFile(err), "Rmdir")
}
files, err := c.List(path.Join(f.root, dir))
f.putFtpConnection(&c)
if err != nil {
return translateErrorDir(err)
}
for _, file := range files {
if file.Type == ftp.EntryTypeFolder && file.Name != "." && file.Name != ".." {
err = f.Rmdir(path.Join(dir, file.Name))
if err != nil {
return errors.Wrap(err, "rmdir")
}
}
}
c, err = f.getFtpConnection()
if err != nil {
return errors.Wrap(err, "Rmdir")
} }
err = c.RemoveDir(path.Join(f.root, dir)) err = c.RemoveDir(path.Join(f.root, dir))
f.putFtpConnection(&c) f.putFtpConnection(&c)