Merge branch 'master' into dist/eole/2.7.1/master
This commit is contained in:
commit
d45f19c005
|
@ -7,23 +7,26 @@
|
||||||
%return %%repository
|
%return %%repository
|
||||||
%end def
|
%end def
|
||||||
|
|
||||||
%set %%repositories_detail = {'name': r.additional_repository_name, 'source': r.additional_repository_source, 'priority': 500, 'execptions': [] for r in %%getVar('additional_repository_name')}
|
%set %%repositories_detail = {}
|
||||||
%for %%priority_target in %%getVar('additional_repository_priority_target', [])
|
%for %%additional_repository in %%getVar('additional_repository_name')
|
||||||
%if %%priority_target.additional_priority_target in %%repositories_detail
|
%silent %%repositories_detail[%%str(%%additional_repository)] = {'source': %%additional_repository.additional_repository_source, 'priority': 500, 'exceptions': []}
|
||||||
%silent %%repositories_detail[%%priority_target.additional_repository_priority_target]['priority'] = %%priority_target.additional_repository_global_priority
|
%end for
|
||||||
%silent %%repositories_detail[%%priority_target.additional_repository_priority_target]['exceptions'] = %%priority_target.additional_repository_exempted_packages.split()
|
%for %%priority_settings in %%getVar('additional_repository_priority_target')
|
||||||
|
%if %%str(%%priority_settings) in %%repositories_detail
|
||||||
|
%silent %%repositories_detail[%%str(%%priority_settings)]['priority'] = %%priority_settings.additional_repository_global_priority
|
||||||
|
%if %%priority_settings.additional_repository_exempted_packages
|
||||||
|
%silent %%repositories_detail[%%str(%%priority_settings)]['exceptions'] = %%str.split(%%priority_settings.additional_repository_exempted_packages)
|
||||||
|
%end if
|
||||||
%end if
|
%end if
|
||||||
%end for
|
%end for
|
||||||
|
|
||||||
|
|
||||||
%for %%repository in %%repositories_detail
|
%for %%repository in %%repositories_detail
|
||||||
Package: *
|
Package: *
|
||||||
Pin: release %%repository_identification(%%repository['source'])
|
Pin: release %%repository_identification(%%repositories_detail[%%repository]['source'])
|
||||||
Pin-Priority: %%repository['priority']
|
Pin-Priority: %%repositories_detail[%%repository]['priority']
|
||||||
|
|
||||||
%for %%exception in %%repositories_detail[%%repository]['exceptions']
|
%for %%exception in %%repositories_detail[%%repository]['exceptions']
|
||||||
Package: %%exception
|
Package: %%exception
|
||||||
Pin: release %%repository_identification(%%repository['source'])
|
Pin: release %%repository_identification(%%repositories_detail[%%repository]['source'])
|
||||||
Pin-Priority: 500
|
Pin-Priority: 500
|
||||||
%end for
|
%end for
|
||||||
%end for
|
%end for
|
||||||
|
|
Loading…
Reference in New Issue