Ubuntu One Servers

  1. Bug #462003
  2. Comment #9

Comment 9 for bug 462003

Revision history for this message
Roman Yepishev (rye) wrote : Re: [Bug 462003] Re: server-side tree deletion results in .u1conflict folders on clients.

On Tue, 2010-02-16 at 16:16 +0000, Naty Bidart wrote:
> Facundo suggested this possible fix: https://pastebin.canonical.com/27792/
> We need to build proper test cases.
 ...
+ for (dirpath, dirnames, filenames) in os.walk(path):
+ for fname in filenames:
+ if fname.endswith(self.CONFLICT_SUFFIX):
+ logger("Conflicting dir remove because previous "
+ "conflict: %r", os.path.join(dirpath, fname))
+ return False
...

I'd suggest that it should also check dirnames for conflict suffix,
since it is possible to have the whole directory to be marked as a
conflict. Just to be on a safe side.