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. -- server-side tree deletion results in .u1conflict folders on clients. https://bugs.launchpad.net/bugs/462003 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
