ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-06 02:16:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2447-cp-overwrite'

Browse Source
This commit is contained in:
Brian Warner 2015-07-28 17:39:39 -07:00
commit 06c190e28c
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/allmydata/scripts/tahoe_cp.py
View File

@ -496,8 +496,9 @@ class Copier:
def try_copy(self):
"""
All usage errors are caught here, not in a subroutine. This bottoms
out in copy_file_to_file() or copy_things_to_directory().
All usage errors (except for target filename collisions) are caught
here, not in a subroutine. This bottoms out in copy_file_to_file() or
copy_things_to_directory().
"""
source_specs = self.options.sources
destination_spec = self.options.destination
@ -735,6 +736,23 @@ class Copier:
# sourceobject) dicts for all the files that need to wind up there.
targetmap = self.build_targetmap(sources, target)
# target name collisions are an error
collisions = []
for target, sources in targetmap.items():
target_names = {}
for source in sources:
name = source.basename()
if name in target_names:
collisions.append((target, source, target_names[name]))
else:
target_names[name] = source
if collisions:
self.to_stderr("cannot copy multiple files with the same name into the same target directory")
# I'm not sure how to show where the collisions are coming from
#for (target, source1, source2) in collisions:
# self.to_stderr(source1.basename())
return 1
# step four: walk through the list of targets. For each one, copy all
# the files. If the target is a TahoeDirectory, upload and create
# read-caps, then do a set_children to the target directory.

12
src/allmydata/test/test_cli_cp.py
View File

@ -787,11 +787,11 @@ cp -r $PARENTCAP/dir3/file3 $DIRCAP $PARENTCAP/dir2 $FILECAP to/missing/ : E2-DE
cp -r $PARENTCAP/dir4 to : to/dir4/emptydir/
cp -r $PARENTCAP/dir4 to/ : to/dir4/emptydir/
# name collisions: ensure files are copied in order
cp -r $PARENTCAP/dir6/dir $PARENTCAP/dir5/dir to : to/dir/collide=5
cp -r $PARENTCAP/dir5/dir $PARENTCAP/dir6/dir to : to/dir/collide=6
cp -r $DIRCAP6 $DIRCAP5 to : to/dir/collide=5
cp -r $DIRCAP5 $DIRCAP6 to : to/dir/collide=6
# name collisions should cause errors, not overwrites
cp -r $PARENTCAP/dir6/dir $PARENTCAP/dir5/dir to : E9-COLLIDING-TARGETS
cp -r $PARENTCAP/dir5/dir $PARENTCAP/dir6/dir to : E9-COLLIDING-TARGETS
cp -r $DIRCAP6 $DIRCAP5 to : E9-COLLIDING-TARGETS
cp -r $DIRCAP5 $DIRCAP6 to : E9-COLLIDING-TARGETS
"""
@ -952,6 +952,8 @@ class CopyOut(GridTestMixin, CLITestMixin, unittest.TestCase):
if (err.startswith("source ") and
"is not a directory, but ends with a slash" in err):
return set(["E8-BADSLASH"])
if err == "cannot copy multiple files with the same name into the same target directory":
return set(["E9-COLLIDING-TARGETS"])
self.fail("unrecognized error ('%s') %s" % (case, res))
d.addCallback(_check)
return d