1 |
commit: 733f401dafd7cf55ee939e2fff9fdc57d0670bdc |
2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
3 |
AuthorDate: Tue Jul 29 18:23:32 2014 +0000 |
4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
5 |
CommitDate: Tue Jul 29 18:24:37 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=733f401d |
7 |
|
8 |
packagerules/generators/addition_control: fix |
9 |
|
10 |
Cannot compare str to version tuple -- use str on both sides, which means that |
11 |
the addition control rule generator has to create acceptors with |
12 |
get_ebuild_version() as value getter and not get_ebuild_version_tuple(). |
13 |
|
14 |
--- |
15 |
roverlay/packagerules/generators/addition_control.py | 5 +++-- |
16 |
1 file changed, 3 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/roverlay/packagerules/generators/addition_control.py b/roverlay/packagerules/generators/addition_control.py |
19 |
index 9aeada3..50b16a7 100644 |
20 |
--- a/roverlay/packagerules/generators/addition_control.py |
21 |
+++ b/roverlay/packagerules/generators/addition_control.py |
22 |
@@ -36,7 +36,7 @@ from roverlay.packagerules.acceptors.stringmatch import ( |
23 |
) |
24 |
|
25 |
from roverlay.packagerules.acceptors.util import ( |
26 |
- get_category, get_ebuild_name, get_ebuild_version_tuple, |
27 |
+ get_category, get_ebuild_name, get_ebuild_version, |
28 |
) |
29 |
|
30 |
import roverlay.util.fileio |
31 |
@@ -474,7 +474,8 @@ class AdditionControlPackageRuleGenerator ( |
32 |
package_token, |
33 |
( |
34 |
get_ebuild_name, |
35 |
- get_ebuild_version_tuple |
36 |
+ # FIXME: use get_ebuild_version_tuple() |
37 |
+ get_ebuild_version |
38 |
) |
39 |
) if item_and_getter[0] and item_and_getter[0] is not True |
40 |
] |