1 |
commit: 142c037fa2ad4e50aeb0636036bbe0ef5c68b381 |
2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
3 |
AuthorDate: Tue Jul 29 19:19:21 2014 +0000 |
4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
5 |
CommitDate: Tue Jul 29 19:19:21 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=142c037f |
7 |
|
8 |
addition control pkg rule gen: fix |
9 |
|
10 |
correctly handle extended_default_bitmask and call _splitmask_line(). |
11 |
|
12 |
--- |
13 |
roverlay/packagerules/generators/addition_control.py | 11 ++++++++--- |
14 |
1 file changed, 8 insertions(+), 3 deletions(-) |
15 |
|
16 |
diff --git a/roverlay/packagerules/generators/addition_control.py b/roverlay/packagerules/generators/addition_control.py |
17 |
index 50b16a7..6d5a5c5 100644 |
18 |
--- a/roverlay/packagerules/generators/addition_control.py |
19 |
+++ b/roverlay/packagerules/generators/addition_control.py |
20 |
@@ -610,7 +610,10 @@ class BitmaskMapCreator ( object ): |
21 |
insert_package = self._insert_package |
22 |
|
23 |
if extended_format: |
24 |
- for call_args in map ( self._split_bitmask_line, arglist ): |
25 |
+ split_bitmask_line = self._split_bitmask_line |
26 |
+ |
27 |
+ for arg in arglist: |
28 |
+ call_args = split_bitmask_line ( arg, bitmask ) |
29 |
insert_package ( call_args[0], call_args[1], package_regex ) |
30 |
|
31 |
else: |
32 |
@@ -834,14 +837,16 @@ def create_addition_control_package_rule ( |
33 |
|
34 |
if cmdline_package_extended or cmdline_ebuild_extended: |
35 |
feed_bitmask ( |
36 |
- None, cmdline_package_extended, cmdline_ebuild_extended, |
37 |
+ extended_default_bitmask, |
38 |
+ cmdline_package_extended, cmdline_ebuild_extended, |
39 |
extended_format=True |
40 |
) |
41 |
# -- |
42 |
|
43 |
if file_package_extended or file_ebuild_extended: |
44 |
filefeed_bitmask ( |
45 |
- None, file_package_extended, file_ebuild_extended, |
46 |
+ extended_default_bitmask, |
47 |
+ file_package_extended, file_ebuild_extended, |
48 |
extended_format=True |
49 |
) |
50 |
# -- |