Merge pull request #689 from myeisha/deduplicate-mkdir

don't duplicate Remote::mkdir in explorer transfer
This commit is contained in:
Darko Poljak 2018-09-22 20:52:33 +02:00 committed by GitHub
commit 9b6ed0adc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -147,7 +147,6 @@ class Explorer(object):
def transfer_global_explorers(self): def transfer_global_explorers(self):
"""Transfer the global explorers to the remote side.""" """Transfer the global explorers to the remote side."""
self.remote.mkdir(self.remote.global_explorer_path)
self.remote.transfer(self.local.global_explorer_path, self.remote.transfer(self.local.global_explorer_path,
self.remote.global_explorer_path, self.remote.global_explorer_path,
self.jobs) self.jobs)
@ -223,7 +222,6 @@ class Explorer(object):
cdist_type.explorer_path) cdist_type.explorer_path)
destination = os.path.join(self.remote.type_path, destination = os.path.join(self.remote.type_path,
cdist_type.explorer_path) cdist_type.explorer_path)
self.remote.mkdir(destination)
self.remote.transfer(source, destination) self.remote.transfer(source, destination)
self.remote.run(["chmod", "0700", "%s/*" % (destination)]) self.remote.run(["chmod", "0700", "%s/*" % (destination)])
self._type_explorers_transferred.append(cdist_type.name) self._type_explorers_transferred.append(cdist_type.name)
@ -235,5 +233,4 @@ class Explorer(object):
cdist_object.parameter_path) cdist_object.parameter_path)
destination = os.path.join(self.remote.object_path, destination = os.path.join(self.remote.object_path,
cdist_object.parameter_path) cdist_object.parameter_path)
self.remote.mkdir(destination)
self.remote.transfer(source, destination) self.remote.transfer(source, destination)