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 C59B01393E9 for ; Tue, 1 Apr 2014 16:38:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31E5BE0A6E; Tue, 1 Apr 2014 16:38:51 +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 92A75E0A6E for ; Tue, 1 Apr 2014 16:38:50 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6DAE333FCE8 for ; Tue, 1 Apr 2014 16:38:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 3B722188F6 for ; Tue, 1 Apr 2014 16:38:48 +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: <1396280294.f9fa3b5544e0009297a771c6efd7e7d24cce8fbc.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/console/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/console/interpreter.py X-VCS-Directories: roverlay/console/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: f9fa3b5544e0009297a771c6efd7e7d24cce8fbc X-VCS-Branch: master Date: Tue, 1 Apr 2014 16:38:48 +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: 2777c27c-d718-4e8b-a4e3-2c30d5b9f25d X-Archives-Hash: 26744d2df45f573a13885116da145cf4 commit: f9fa3b5544e0009297a771c6efd7e7d24cce8fbc Author: André Erdmann mailerd de> AuthorDate: Mon Mar 31 15:38:14 2014 +0000 Commit: André Erdmann mailerd de> CommitDate: Mon Mar 31 15:38:14 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=f9fa3b55 console interpreter: do not fail if var is not set --- roverlay/console/interpreter.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roverlay/console/interpreter.py b/roverlay/console/interpreter.py index e31096f..107a14a 100644 --- a/roverlay/console/interpreter.py +++ b/roverlay/console/interpreter.py @@ -281,7 +281,10 @@ class ConsoleInterpreter ( cmd.Cmd ): else: l = line - return self._str_formatter.vformat ( l, (), self._locals ) + try: + return self._str_formatter.vformat ( l, (), self._locals ) + except KeyError as kerr: + raise ConsoleUsageException ( "{!s} is not set.".format ( kerr ) ) # --- end of format_locals (...) --- def get_fspath ( self, line ):