summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2013-10-01 14:47:50 -0500
committerJames Cammarata <jimi@sngx.net>2013-10-07 13:50:19 -0500
commitdcc48f248dc848e66e05e0d57ebeb28b6ff189dd (patch)
treeaa90505a07b2221112eb8506e24b80509ea5e019
parent191ce5e103de27850f361d3560b80ff6dc6c7f07 (diff)
downloadansible-dcc48f248dc848e66e05e0d57ebeb28b6ff189dd.tar.gz
Use atomic_move to put the file, rather than shelling out
Fixes #4321 Conflicts: library/utilities/accelerate
-rw-r--r--library/utilities/accelerate9
1 files changed, 1 insertions, 8 deletions
diff --git a/library/utilities/accelerate b/library/utilities/accelerate
index 4ac2fa478a..9ff84c6e2e 100644
--- a/library/utilities/accelerate
+++ b/library/utilities/accelerate
@@ -380,14 +380,7 @@ class ThreadedTCPRequestHandler(SocketServer.BaseRequestHandler):
if final_path:
vvv("moving %s to %s" % (out_path, final_path))
- args = ['sudo','cp',out_path,final_path]
- rc, stdout, stderr = self.server.module.run_command(args, close_fds=True)
- if rc != 0:
- return dict(failed=True, stdout="failed to copy the file into position with sudo")
- args = ['sudo','chown',final_user,out_path,final_path]
- rc, stdout, stderr = self.server.module.run_command(args, close_fds=True)
- if rc != 0:
- return dict(failed=True, stdout="failed to chown the file via sudo")
+ self.server.module.atomic_move(out_path, final_path)
return dict()
def daemonize(module, password, port, timeout, minutes):