tahoe cp -r now copies the top level directory with its children

This commit is contained in:
Mark Berger 2013-08-05 11:53:07 -04:00 committed by Brian Warner
parent 2d8ffdc0ee
commit 1c96039270

View File

@ -654,8 +654,9 @@ class Copier:
for (name,s) in source_files:
self.attach_to_target(s, name, target)
for source in source_dirs:
self.assign_targets(source, target)
for (name, source) in source_dirs:
new_target = target.get_child_target(name)
self.assign_targets(source, new_target)
self.progress("targets assigned, %s dirs, %s files" %
(len(self.targetmap), self.files_to_copy))
@ -763,7 +764,9 @@ class Copier:
for name,source in source_infos:
if isinstance(source, (LocalDirectorySource, TahoeDirectorySource)):
source.populate(True)
graphs.append(source)
# Remove trailing slash (if applicable) and get dir name
name = os.path.basename(os.path.normpath(name))
graphs.append((name, source))
return graphs