From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SnGsO-0005U1-GD for garchives@archives.gentoo.org; Fri, 06 Jul 2012 22:19:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94B62E0552; Fri, 6 Jul 2012 22:19:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 66637E0552 for ; Fri, 6 Jul 2012 22:19:11 +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 B5D2D1B4011 for ; Fri, 6 Jul 2012 22:19:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B703AE5446 for ; Fri, 6 Jul 2012 22:19:08 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1341612727.5a8f2a07655db3a15af5c82d4d8fffd14c7582d8.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/recipe/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/recipe/easyresolver.py X-VCS-Directories: roverlay/recipe/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 5a8f2a07655db3a15af5c82d4d8fffd14c7582d8 X-VCS-Branch: master Date: Fri, 6 Jul 2012 22:19:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 428ec4df-76dd-4827-b72e-fab83111efdc X-Archives-Hash: fe1c0fc562000793d629a429d1038b26 commit: 5a8f2a07655db3a15af5c82d4d8fffd14c7582d8 Author: Andr=C3=A9 Erdmann mailerd de> AuthorDate: Fri Jul 6 22:12:07 2012 +0000 Commit: Andr=C3=A9 Erdmann mailerd de> CommitDate: Fri Jul 6 22:12:07 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git= ;a=3Dcommit;h=3D5a8f2a07 make listener modules and dep rule pools optional modified: roverlay/recipe/easyresolver.py --- roverlay/recipe/easyresolver.py | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/roverlay/recipe/easyresolver.py b/roverlay/recipe/easyresolv= er.py index c083bda..e510181 100644 --- a/roverlay/recipe/easyresolver.py +++ b/roverlay/recipe/easyresolver.py @@ -12,19 +12,20 @@ def setup(): =20 srule_pool =3D SimpleDependencyRulePool ( 'default pool', priority=3D45= ) =20 - srule_files =3D config.get_or_fail ( 'DEPRES.simple_rules.files' ) + srule_files =3D config.get ( 'DEPRES.simple_rules.files', None ) =20 - unres_listener =3D listeners.UnresolvableSetFileListener ( - config.get_or_fail ( 'LOG.FILE.unresolvable' ) - ) + if srule_files: + if isinstance ( srule_files, str ): + srule_pool.load_rule_file ( srule_files ) + else: + for f in srule_files: + srule_pool.load_rule_file ( f ) =20 - if isinstance ( srule_files, str ): - srule_pool.load_rule_file ( srule_files ) - else: - for f in srule_files: - srule_pool.load_rule_file ( f ) + res.add_rulepool ( srule_pool ) =20 - res.add_rulepool ( srule_pool ) - res.add_listener ( unres_listener ) + unres_file =3D config.get ( 'LOG.FILE.unresolvable', None ) + if unres_file: + unres_listener =3D listeners.UnresolvableSetFileListener ( unres_file = ) + res.add_listener ( unres_listener ) return res # --- end of setup (...) ---