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

Merge pull request #5472 from RSpiertz/apt_repository

Browse source 
apt_repository: don't crash if default_file doesn't exist
This commit is contained in:
jctanner 2014-01-14 14:26:19 -08:00
commit c8615e32ad
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packaging/apt_repository
View file

@ -3,6 +3,7 @@
# (c) 2012, Matt Wright <matt@nobien.net> # (c) 2012, Matt Wright <matt@nobien.net>
# (c) 2013, Alexander Saltanov <asd@mokote.com> # (c) 2013, Alexander Saltanov <asd@mokote.com>
# (c) 2014, Rutger Spiertz <rutger@kumina.nl>
# #
# This file is part of Ansible # This file is part of Ansible
# #
@ -111,8 +112,9 @@ class SourcesList(object):
self.files = {} # group sources by file self.files = {} # group sources by file
self.default_file = apt_pkg.config.find_file('Dir::Etc::sourcelist') self.default_file = apt_pkg.config.find_file('Dir::Etc::sourcelist')
# read sources.list # read sources.list if it exists
self.load(self.default_file) if os.path.isfile(self.default_file):
self.load(self.default_file)
# read sources.list.d # read sources.list.d
for file in glob.iglob('%s/*.list' % apt_pkg.config.find_dir('Dir::Etc::sourceparts')): for file in glob.iglob('%s/*.list' % apt_pkg.config.find_dir('Dir::Etc::sourceparts')):