saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #23866 from jfindlay/flag_strip

Browse source 
backport #23834, change portage.dep.strip_empty to list comprehension
This commit is contained in:
Thomas S Hatch 2015-05-19 09:50:42 -06:00
commit 6bae12fa8b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/portage_config.py
View file

@ -227,7 +227,7 @@ def _merge_flags(new_flags, old_flags=None, conf='any'):
old_flags = []
args = [old_flags, new_flags]
if conf == 'accept_keywords':
tmp = new_flags+ \
tmp = new_flags + \
[i for i in old_flags if _check_accept_keywords(new_flags, i)]
else:
tmp = portage.flatten(args)
@ -274,7 +274,7 @@ def append_to_package_conf(conf, atom='', flags=None, string='', overwrite=False
new_flags = list(flags)
else:
atom = string.strip().split()[0]
new_flags = portage.dep.strip_empty(string.strip().split(' '))[1:]
new_flags = [flag for flag in string.strip().split(' ') if flag][1:]
if '/' not in atom:
atom = _p_to_cp(atom)
string = '{0} {1}'.format(atom, ' '.join(new_flags))
@ -335,7 +335,7 @@ def append_to_package_conf(conf, atom='', flags=None, string='', overwrite=False
new_contents += string.strip() + '\n'
added = True
else:
old_flags = portage.dep.strip_empty(l_strip.split(' '))[1:]
old_flags = [flag for flag in l_strip.split(' ') if flag][1:]
if conf == 'accept_keywords':
if not old_flags:
new_contents += l
@ -415,7 +415,7 @@ def get_flags_from_package_conf(conf, atom):
line_package = line.split()[0]
line_list = _porttree().dbapi.xmatch("match-all", line_package)
if match_list.issubset(line_list):
f_tmp = portage.dep.strip_empty(line.strip().split()[1:])
f_tmp = [flag for flag in line.strip().split(' ') if flag][1:]
if f_tmp:
flags.extend(f_tmp)
else: