cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

apt_repository: fix file mode

Browse source 
'set_mode_if_different' method should be called on dest filename and after
'atomic_move' method
This commit is contained in:
Pierre-Louis Bonicoli 2014-11-16 01:13:29 +01:00 committed by Matt Clay
parent b318bc8b43
commit c366e7acb2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/packaging/os/apt_repository.py
View file

@ -238,10 +238,6 @@ class SourcesList(object):
d, fn = os.path.split(filename) d, fn = os.path.split(filename)
fd, tmp_path = tempfile.mkstemp(prefix=".%s-" % fn, dir=d) fd, tmp_path = tempfile.mkstemp(prefix=".%s-" % fn, dir=d)
# allow the user to override the default mode
this_mode = module.params['mode']
module.set_mode_if_different(tmp_path, this_mode, False)
f = os.fdopen(fd, 'w') f = os.fdopen(fd, 'w')
for n, valid, enabled, source, comment in sources: for n, valid, enabled, source, comment in sources:
chunks = [] chunks = []
@ -259,6 +255,10 @@ class SourcesList(object):
except IOError, err: except IOError, err:
module.fail_json(msg="Failed to write to file %s: %s" % (tmp_path, unicode(err))) module.fail_json(msg="Failed to write to file %s: %s" % (tmp_path, unicode(err)))
module.atomic_move(tmp_path, filename) module.atomic_move(tmp_path, filename)
# allow the user to override the default mode
this_mode = module.params['mode']
module.set_mode_if_different(filename, this_mode, False)
else: else:
del self.files[filename] del self.files[filename]
if os.path.exists(filename): if os.path.exists(filename):