JPT
/
gpgfs
1
0
Fork 0
Code Issues Pull Requests Activity

rename: test for more rename error conditions

This commit is contained in:
Jarno Seppänen 2014-05-02 21:23:11 +03:00
parent 6a9ef541ab
commit 9aff59979d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gpgfs.py
View File

@ -340,13 +340,21 @@ class GpgFs(LoggingMixIn, Operations):
def rename(self, old, new): def rename(self, old, new):
self.flush(old, 0) self.flush(old, 0)
self._clear_write_cache() self._clear_write_cache()
if new.startswith(old):
raise FuseOSError(errno.EINVAL)
old_dir, old_name = self._find(old, parent=True) old_dir, old_name = self._find(old, parent=True)
if old_name not in old_dir.children: if old_name not in old_dir.children:
raise FuseOSError(errno.ENOENT) raise FuseOSError(errno.ENOENT)
new_dir, new_name = self._find(new, parent=True) new_dir, new_name = self._find(new, parent=True)
prev_ent = new_dir.children.get(new_name) prev_ent = new_dir.children.get(new_name)
if prev_ent and prev_ent.type == ENT_DIR and prev_ent.children: if prev_ent:
if prev_ent.type == ENT_DIR:
if old_dir[old_name].type != ENT_DIR:
raise FuseOSError(errno.EISDIR)
if prev_ent.children:
raise FuseOSError(errno.ENOTEMPTY) raise FuseOSError(errno.ENOTEMPTY)
elif old_dir[old_name].type == ENT_DIR:
raise FuseOSError(errno.ENOTDIR)
prev_old_mtime = old_dir.st_mtime prev_old_mtime = old_dir.st_mtime
prev_new_mtime = new_dir.st_mtime prev_new_mtime = new_dir.st_mtime
new_dir.children[new_name] = old_dir.children.pop(old_name) new_dir.children[new_name] = old_dir.children.pop(old_name)