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 E599F138204 for ; Wed, 28 Aug 2013 09:39:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A269CE095A; Wed, 28 Aug 2013 09:38:59 +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 22B55E0825 for ; Wed, 28 Aug 2013 09:38:58 +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 280E733ECD3 for ; Wed, 28 Aug 2013 09:38:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A67A2E545F for ; Wed, 28 Aug 2013 09:38:56 +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: <1377682480.cc03c1b78e2f92191748d3f7d3b5a02df119a33a.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/packagerules/parser/context/, roverlay/packagerules/actions/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/packagerules/actions/dependencies.py roverlay/packagerules/parser/context/action.py X-VCS-Directories: roverlay/packagerules/parser/context/ roverlay/packagerules/actions/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: cc03c1b78e2f92191748d3f7d3b5a02df119a33a X-VCS-Branch: master Date: Wed, 28 Aug 2013 09:38:56 +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: 4402497b-c2ab-4630-abd5-4b14f34cdd80 X-Archives-Hash: 4939de78a4589819b93c2f7f39c059d1 commit: cc03c1b78e2f92191748d3f7d3b5a02df119a33a Author: André Erdmann mailerd de> AuthorDate: Wed Aug 28 09:34:40 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Wed Aug 28 09:34:40 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=cc03c1b7 package rule parser, depstr_ignore: minor changes * don't unquote the dependency string * store data in depconf->depstr_ignore, not depconf->depres_ignore --- roverlay/packagerules/actions/dependencies.py | 2 +- roverlay/packagerules/parser/context/action.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/roverlay/packagerules/actions/dependencies.py b/roverlay/packagerules/actions/dependencies.py index db4671d..f6233a2 100644 --- a/roverlay/packagerules/actions/dependencies.py +++ b/roverlay/packagerules/actions/dependencies.py @@ -163,7 +163,7 @@ class DependencyInjectAction ( DependencyVarAction ): # --- end of DependencyInjectAction (...) --- class DepStrIgnoreAction ( DependencyVarAction ): - CATEGORY_KEY = 'depres_ignore' + CATEGORY_KEY = 'depstr_ignore' ACTION_KEYWORD = CATEGORY_KEY CONVERT_VALUE_TO_DEPRESULT = False # --- end of DepStrIgnoreAction --- diff --git a/roverlay/packagerules/parser/context/action.py b/roverlay/packagerules/parser/context/action.py index 284d62e..c860d81 100644 --- a/roverlay/packagerules/parser/context/action.py +++ b/roverlay/packagerules/parser/context/action.py @@ -301,11 +301,10 @@ class RuleActionContext ( depstr_cls = self.KEYWORDS_DEPSTR [keyword] if depstr_cls: + # don't unquote argstr self._add_action ( depstr_cls.from_namespace ( - self.namespace, 'all', - roverlay.strutil.unquote ( argstr ), - lino + self.namespace, 'all', argstr, lino ) ) return True