diff options
| author |   André Erdmann <dywi@mailerd.de> | 2014-07-17 21:13:40 +0200 |
|---|---|---|
| committer | André Erdmann <dywi@mailerd.de> | 2014-07-17 21:13:40 +0200 |
| commit | 384a35d19b894e467bfbfb2cc827eacb1d4f97f5 (patch) | |
| tree | 4d4aac44bda04108e1db48243251391807a5defd /roverlay | |
| parent | package rules: optionally merge acceptor compounds (diff) | |
| download | R_overlay-384a35d19b894e467bfbfb2cc827eacb1d4f97f5.tar.gz R_overlay-384a35d19b894e467bfbfb2cc827eacb1d4f97f5.tar.bz2 R_overlay-384a35d19b894e467bfbfb2cc827eacb1d4f97f5.zip | |
add-policy rule gen: merge acceptor compounds
... by default
Diffstat (limited to 'roverlay')
| -rw-r--r-- | roverlay/packagerules/generators/abstract/addition_control.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/roverlay/packagerules/generators/abstract/addition_control.py b/roverlay/packagerules/generators/abstract/addition_control.py index 9f12ad0..b58b666 100644 --- a/roverlay/packagerules/generators/abstract/addition_control.py +++ b/roverlay/packagerules/generators/abstract/addition_control.py @@ -439,7 +439,8 @@ def create_packagerule_action_map(): def create_package_rules ( reduced_bitmask_acceptor_chain_map, convert_category_token_to_acceptor, - convert_package_token_to_acceptor + convert_package_token_to_acceptor, + collapse_acceptor_combounds=True, ): """Converts the given "effective bitmask" -> "acceptor chain" map into a nested package rule. @@ -453,6 +454,9 @@ def create_package_rules ( -> category acceptor * convert_package_token_to_acceptor -- function(token,priority) -> package acceptor + * collapse_acceptor_combounds -- bool that controls whether acceptor + compounds should be merged or not + Defaults to True. """ packagerule_actions = create_packagerule_action_map() # true acceptor with priority -1 @@ -617,6 +621,9 @@ def create_package_rules ( and_acceptor = roverlay.packagerules.abstract.acceptors.Acceptor_AND (0) and_acceptor.add_acceptor ( actual_acceptor ) + if collapse_acceptor_combounds: + and_acceptor.merge_sub_compounds() + rule = roverlay.packagerules.abstract.rules.PackageRule ( # top-priority action should be applied last priority = AdditionControlResult.get_reversed_sort_key ( emask ) |