From 142c037fa2ad4e50aeb0636036bbe0ef5c68b381 Mon Sep 17 00:00:00 2001 From: André Erdmann Date: Tue, 29 Jul 2014 21:19:21 +0200 Subject: addition control pkg rule gen: fix correctly handle extended_default_bitmask and call _splitmask_line(). --- roverlay/packagerules/generators/addition_control.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/roverlay/packagerules/generators/addition_control.py b/roverlay/packagerules/generators/addition_control.py index 50b16a7..6d5a5c5 100644 --- a/roverlay/packagerules/generators/addition_control.py +++ b/roverlay/packagerules/generators/addition_control.py @@ -610,7 +610,10 @@ class BitmaskMapCreator ( object ): insert_package = self._insert_package if extended_format: - for call_args in map ( self._split_bitmask_line, arglist ): + split_bitmask_line = self._split_bitmask_line + + for arg in arglist: + call_args = split_bitmask_line ( arg, bitmask ) insert_package ( call_args[0], call_args[1], package_regex ) else: @@ -834,14 +837,16 @@ def create_addition_control_package_rule ( if cmdline_package_extended or cmdline_ebuild_extended: feed_bitmask ( - None, cmdline_package_extended, cmdline_ebuild_extended, + extended_default_bitmask, + cmdline_package_extended, cmdline_ebuild_extended, extended_format=True ) # -- if file_package_extended or file_ebuild_extended: filefeed_bitmask ( - None, file_package_extended, file_ebuild_extended, + extended_default_bitmask, + file_package_extended, file_ebuild_extended, extended_format=True ) # -- -- cgit v1.2.3-65-gdbad