diff options
| author | Csaba Henk <csaba@gluster.com> | 2011-03-10 00:41:10 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2011-03-10 07:39:37 -0800 |
| commit | 8717ef57a7b2554fe35da27f3cfd775083538313 (patch) | |
| tree | 4b0ae2f9a1e48034251dc8c817b4bb43afc33260 | |
| parent | 0121c4c9574e09181f73f9ca7316bce2c5ec7ba9 (diff) | |
Revert "syncdaemon: Handling of deleted symlinks (of directories). When a symlink of a directory of master is deleted. The corresponding delete in slave is handled as rmdir() of the symlink assuming the file to be directory"
This reverts commit bee672e5f70b3c6712280130aeb61da0674add11.
Signed-off-by: Kaushik BV <kaushikbv@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 2377 ()
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2377
| -rw-r--r-- | xlators/features/marker/utils/syncdaemon/resource.py | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/xlators/features/marker/utils/syncdaemon/resource.py b/xlators/features/marker/utils/syncdaemon/resource.py index f002f0eb1c4..d1a51ecb06f 100644 --- a/xlators/features/marker/utils/syncdaemon/resource.py +++ b/xlators/features/marker/utils/syncdaemon/resource.py @@ -123,22 +123,7 @@ class Server(object): for e in entries: cls.purge(os.path.join(path, e)) if me_also: - try: - os.rmdir(path) - except OSError: - ex = sys.exc_info()[1] - if ex.errno == ENOTDIR: - try: - os.unlink(path) - return - except OSError: - ex = sys.exc_info()[1] - if ex.errno != ENOENT: - raise - elif ex.errno == ENOENT: - logging.debug ("Trying to delete a file which is not present") - else: - raise + os.rmdir(path) @classmethod def _create(cls, path, ctor): |