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 3BC0C138200 for ; Fri, 23 Aug 2013 13:52:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1474AE0C2A; Fri, 23 Aug 2013 13:52:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97F0EE0C29 for ; Fri, 23 Aug 2013 13:52:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D2B333ECE2 for ; Fri, 23 Aug 2013 13:52:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D0E0FE547C for ; Fri, 23 Aug 2013 13:52:02 +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: <1377265215.52a22dadbfee70229a45447f2ac926cec7405edd.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/packagerules/actions/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/packagerules/actions/dependencies.py X-VCS-Directories: roverlay/packagerules/actions/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 52a22dadbfee70229a45447f2ac926cec7405edd X-VCS-Branch: master Date: Fri, 23 Aug 2013 13:52:02 +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: 3610734c-18b8-459b-b8aa-fb84be19210a X-Archives-Hash: 055bfda7ede86c99f83eec8a0764d0fc commit: 52a22dadbfee70229a45447f2ac926cec7405edd Author: André Erdmann mailerd de> AuthorDate: Fri Aug 23 13:40:15 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Fri Aug 23 13:40:15 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=52a22dad package rules, dep actions: use ConstantDepResult Create dep result objects when injecting deps. --- roverlay/packagerules/actions/dependencies.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/roverlay/packagerules/actions/dependencies.py b/roverlay/packagerules/actions/dependencies.py index 39a002c..5e597e2 100644 --- a/roverlay/packagerules/actions/dependencies.py +++ b/roverlay/packagerules/actions/dependencies.py @@ -4,12 +4,14 @@ # Distributed under the terms of the GNU General Public License; # either version 2 of the License, or (at your option) any later version. -import roverlay.packagerules.abstract.actions - import roverlay.util.dictwalk import roverlay.util.namespace import roverlay.util.objects +import roverlay.depres.depresult + +import roverlay.packagerules.abstract.actions + class DepConfAccess ( roverlay.util.dictwalk.FixedKeyDictWalker ): @@ -76,16 +78,25 @@ class DependencyAction ( class DependencyVarAction ( DependencyAction ): CATEGORY_KEY = None + CONVERT_VALUE_TO_DEPRESULT = True @classmethod - def from_namespace ( cls, namespace, deptype_key, *args, **kwargs ): + def from_namespace ( cls, namespace, deptype_key, value, *args, **kwargs ): assert cls.CATEGORY_KEY is not None depconf_access = namespace.get_object ( DepConfAccess, ( cls.CATEGORY_KEY, deptype_key ) ) + + if cls.CONVERT_VALUE_TO_DEPRESULT: + my_value = namespace.get_object_v ( + roverlay.depres.depresult.ConstantDepResult, ( value, 50, 0 ) + ) + else: + my_value = value + return namespace.get_object_v ( - cls, ( depconf_access, ) + args, kwargs + cls, ( depconf_access, my_value ) + args, kwargs ) # --- end of from_namespace (...) ---