From 733f401dafd7cf55ee939e2fff9fdc57d0670bdc Mon Sep 17 00:00:00 2001 From: André Erdmann Date: Tue, 29 Jul 2014 20:23:32 +0200 Subject: packagerules/generators/addition_control: fix Cannot compare str to version tuple -- use str on both sides, which means that the addition control rule generator has to create acceptors with get_ebuild_version() as value getter and not get_ebuild_version_tuple(). --- roverlay/packagerules/generators/addition_control.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roverlay/packagerules/generators/addition_control.py b/roverlay/packagerules/generators/addition_control.py index 9aeada3..50b16a7 100644 --- a/roverlay/packagerules/generators/addition_control.py +++ b/roverlay/packagerules/generators/addition_control.py @@ -36,7 +36,7 @@ from roverlay.packagerules.acceptors.stringmatch import ( ) from roverlay.packagerules.acceptors.util import ( - get_category, get_ebuild_name, get_ebuild_version_tuple, + get_category, get_ebuild_name, get_ebuild_version, ) import roverlay.util.fileio @@ -474,7 +474,8 @@ class AdditionControlPackageRuleGenerator ( package_token, ( get_ebuild_name, - get_ebuild_version_tuple + # FIXME: use get_ebuild_version_tuple() + get_ebuild_version ) ) if item_and_getter[0] and item_and_getter[0] is not True ] -- cgit v1.2.3-65-gdbad