From 2c3bf1073fcdaee4959eaf6d8f0459eafd815b34 Mon Sep 17 00:00:00 2001 From: Miltiadis Vasilakis Date: Sun, 24 Feb 2013 17:13:06 +0200 Subject: [PATCH] Fix bug in sync daemon when deleting locally objects from different containers/account with the same container/account path --- pithos-macos/PithosSyncDaemon.m | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pithos-macos/PithosSyncDaemon.m b/pithos-macos/PithosSyncDaemon.m index a382462..442bf7e 100644 --- a/pithos-macos/PithosSyncDaemon.m +++ b/pithos-macos/PithosSyncDaemon.m @@ -612,8 +612,7 @@ BOOL isDirectory; BOOL fileExists = [fileManager fileExistsAtPath:filePath isDirectory:&isDirectory]; NSError *error = nil; - NSString *containerDirectoryPath = [self dirPathForAccount:accountName container:pithosContainer.name]; - NSString *newFilePath = [filePath stringByReplacingOccurrencesOfString:containerDirectoryPath withString:self.tempTrashDirPath]; + NSString *newFilePath = [filePath stringByReplacingOccurrencesOfString:directoryPath withString:self.tempTrashDirPath]; NSString *newDirPath = [newFilePath stringByDeletingLastPathComponent]; if (fileExists && isDirectory) { NSArray *subPaths = [fileManager subpathsOfDirectoryAtPath:filePath error:&error]; @@ -649,7 +648,7 @@ } for (NSString *subPath in subPaths) { NSString *subFilePath = [filePath stringByAppendingPathComponent:subPath]; - NSString *newSubFilePath = [subFilePath stringByReplacingOccurrencesOfString:containerDirectoryPath + NSString *newSubFilePath = [subFilePath stringByReplacingOccurrencesOfString:directoryPath withString:self.tempTrashDirPath]; currentState = [currentLocalObjectStates objectForKey:subFilePath]; if (currentState) { -- 1.7.10.4