From 50912c9092eb567c5dc61c47eecd2ccc585ae364 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Wed, 24 Jun 2015 16:32:47 -0700 Subject: [PATCH] Fix apt_repository so that it does not modify the mode of existing repositories --- packaging/os/apt_repository.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packaging/os/apt_repository.py b/packaging/os/apt_repository.py index 496f5c5e269..eee58f77729 100644 --- a/packaging/os/apt_repository.py +++ b/packaging/os/apt_repository.py @@ -126,6 +126,8 @@ class InvalidSource(Exception): class SourcesList(object): def __init__(self): 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') # read sources.list if it exists @@ -257,8 +259,9 @@ class SourcesList(object): 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) + if filename in self.new_repos: + this_mode = module.params['mode'] + module.set_mode_if_different(filename, this_mode, False) else: del self.files[filename] if os.path.exists(filename): @@ -300,6 +303,7 @@ class SourcesList(object): files = self.files[file] files.append((len(files), True, True, source_new, comment_new)) + self.new_repos.add(file) def add_source(self, line, comment='', file=None): source = self._parse(line, raise_if_invalid_or_disabled=True)[2]