From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 915D0138A2F for ; Sat, 23 Aug 2014 19:03:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23183E096C; Sat, 23 Aug 2014 19:03:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E50CE096C for ; Sat, 23 Aug 2014 19:03:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA49A34029A for ; Sat, 23 Aug 2014 19:03:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF7C03C33 for ; Sat, 23 Aug 2014 19:03:04 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1406658277.733f401dafd7cf55ee939e2fff9fdc57d0670bdc.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/packagerules/generators/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/packagerules/generators/addition_control.py X-VCS-Directories: roverlay/packagerules/generators/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 733f401dafd7cf55ee939e2fff9fdc57d0670bdc X-VCS-Branch: master Date: Sat, 23 Aug 2014 19:03:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ff67d73c-f2f6-4adb-9dd6-12e8b27f9bc7 X-Archives-Hash: 9141922d3699ebab4c2122dd43f107f4 Message-ID: <20140823190304.tg89nBIeVLY2LP88dMbDEanXMiygcEqqcsA_Og7Ecwk@z> commit: 733f401dafd7cf55ee939e2fff9fdc57d0670bdc Author: André Erdmann mailerd de> AuthorDate: Tue Jul 29 18:23:32 2014 +0000 Commit: André Erdmann mailerd de> CommitDate: Tue Jul 29 18:24:37 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=733f401d 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 ]