aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Erdmann <dywi@mailerd.de>2014-07-29 20:23:32 +0200
committerAndré Erdmann <dywi@mailerd.de>2014-07-29 20:24:37 +0200
commit733f401dafd7cf55ee939e2fff9fdc57d0670bdc (patch)
treed139fef55e0399cb8935b92efd14b31531d70bc6
parentroverlay/overlay/rulegen: fix dot handling (diff)
downloadR_overlay-733f401dafd7cf55ee939e2fff9fdc57d0670bdc.tar.gz
R_overlay-733f401dafd7cf55ee939e2fff9fdc57d0670bdc.tar.bz2
R_overlay-733f401dafd7cf55ee939e2fff9fdc57d0670bdc.zip
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().
-rw-r--r--roverlay/packagerules/generators/addition_control.py5
1 files 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
]