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 1A0211381F3 for ; Sun, 2 Dec 2012 11:49:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF56621C003; Sun, 2 Dec 2012 11:49:04 +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 500E021C003 for ; Sun, 2 Dec 2012 11:49:04 +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 3EE5833D985 for ; Sun, 2 Dec 2012 11:49:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C6BC4E5436 for ; Sun, 2 Dec 2012 11:49:01 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1354448927.348a534efb282ab5e3209ab7c07f1344c887f110.zorry@gentoo> Subject: [gentoo-commits] dev/zorry:master commit in: gobs/pym/ X-VCS-Repository: dev/zorry X-VCS-Files: gobs/pym/check_setup.py X-VCS-Directories: gobs/pym/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 348a534efb282ab5e3209ab7c07f1344c887f110 X-VCS-Branch: master Date: Sun, 2 Dec 2012 11:49:01 +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: 74349c5d-12fa-4257-a01d-75c42444eb09 X-Archives-Hash: d6e287c78454080ffd2f8a0f350ad0fa commit: 348a534efb282ab5e3209ab7c07f1344c887f110 Author: Magnus Granberg gentoo org> AuthorDate: Sun Dec 2 11:48:47 2012 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Sun Dec 2 11:48:47 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=348a534e fix the validate() error if we have layman support --- gobs/pym/check_setup.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gobs/pym/check_setup.py b/gobs/pym/check_setup.py index 8b19e48..99d1dbb 100644 --- a/gobs/pym/check_setup.py +++ b/gobs/pym/check_setup.py @@ -3,8 +3,8 @@ import portage import os import errno +from portage.exception import DigestException, FileNotFound, ParseError, PermissionDenied from gobs.text import get_file_text - from gobs.readconf import get_conf_settings reader=get_conf_settings() gobs_settings_dict=reader.read_gobs_settings_all() @@ -34,12 +34,12 @@ def check_make_conf(): # Check if we envorment error with the config. (settings.validate) try: make_conf_checksum_tree = portage.checksum.sha256hash(make_conf_file)[0] - portage.util.getconfig(make_conf_file, tolerant=0, allow_sourcing=False, expand=True) + portage.util.getconfig(make_conf_file, tolerant=0, allow_sourcing=True, expand=True) mysettings = portage.config(config_root = check_config_dir) mysettings.validate() # With errors we update the db on the config and disable the config - except Exception as e: - attDict['config_error'] = e + except ParseError as e: + attDict['config_error'] = str(e) attDict['active'] = 'False' log_msg = "%s FAIL!" % (config,) add_gobs_logs(conn, log_msg, "info", config_profile)