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

Fix apt_repository so that it does not modify the mode of existing repositories

Browse source
This commit is contained in:
Toshio Kuratomi 2015-06-24 16:32:47 -07:00 committed by Matt Clay
parent 1f6c177da0
commit 9ecd06fb47
1 changed files with 6 additions and 2 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

@ -126,6 +126,8 @@ class InvalidSource(Exception):
class SourcesList(object): class SourcesList(object):
def __init__(self): def __init__(self):
self.files = {} # group sources by file self.files = {} # group sources by file
# Repositories that we're adding -- used to implement mode param
self.new_repos = set()
self.default_file = self._apt_cfg_file('Dir::Etc::sourcelist') self.default_file = self._apt_cfg_file('Dir::Etc::sourcelist')
# read sources.list if it exists # read sources.list if it exists
@ -257,8 +259,9 @@ class SourcesList(object):
module.atomic_move(tmp_path, filename) module.atomic_move(tmp_path, filename)
# allow the user to override the default mode # allow the user to override the default mode
this_mode = module.params['mode'] if filename in self.new_repos:
module.set_mode_if_different(filename, this_mode, False) 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):
@ -300,6 +303,7 @@ class SourcesList(object):
files = self.files[file] files = self.files[file]
files.append((len(files), True, True, source_new, comment_new)) files.append((len(files), True, True, source_new, comment_new))
self.new_repos.add(file)
def add_source(self, line, comment='', file=None): def add_source(self, line, comment='', file=None):
source = self._parse(line, raise_if_invalid_or_disabled=True)[2] source = self._parse(line, raise_if_invalid_or_disabled=True)[2]