projects
/
tahoe-lafs
/
tahoe-lafs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
276ff64
)
import ConflictError
author
David Stainton
<dstainton415@gmail.com>
Mon, 26 Oct 2015 17:57:46 +0000
(18:57 +0100)
committer
Daira Hopwood
<daira@jacaranda.org>
Tue, 27 Oct 2015 15:13:40 +0000
(15:13 +0000)
src/allmydata/frontends/magic_folder.py
patch
|
blob
|
history
diff --git
a/src/allmydata/frontends/magic_folder.py
b/src/allmydata/frontends/magic_folder.py
index e1df0a64a4a59593bbe448134eb7a2f6314937e8..7ae36b17ec4759f426d4e14dc9c7c00f2d5a582d 100644
(file)
--- a/
src/allmydata/frontends/magic_folder.py
+++ b/
src/allmydata/frontends/magic_folder.py
@@
-13,7
+13,7
@@
from twisted.application import service
from allmydata.util import fileutil
from allmydata.interfaces import IDirectoryNode
from allmydata.util import log
-from allmydata.util.fileutil import precondition_abspath, get_pathinfo
+from allmydata.util.fileutil import precondition_abspath, get_pathinfo
, ConflictError
from allmydata.util.assertutil import precondition
from allmydata.util.deferredutil import HookMixin
from allmydata.util.encodingutil import listdir_filepath, to_filepath, \