From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-683765-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C65C51387FD for <garchives@archives.gentoo.org>; Sat, 5 Apr 2014 13:05:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6774E0946; Sat, 5 Apr 2014 13:05:17 +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 80F72E0946 for <gentoo-commits@lists.gentoo.org>; Sat, 5 Apr 2014 13:05:17 +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 70BB833FD76 for <gentoo-commits@lists.gentoo.org>; Sat, 5 Apr 2014 13:05:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id E025F18874 for <gentoo-commits@lists.gentoo.org>; Sat, 5 Apr 2014 13:05:13 +0000 (UTC) From: "Alexander Berntsen" <bernalex@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexander Berntsen" <bernalex@gentoo.org> Message-ID: <1396703060.027bac6855b66b7db997a9cf6b4e33ff7ee85ba2.bernalex@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: bernalex X-VCS-Committer-Name: Alexander Berntsen X-VCS-Revision: 027bac6855b66b7db997a9cf6b4e33ff7ee85ba2 X-VCS-Branch: master Date: Sat, 5 Apr 2014 13:05:13 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 585b161a-4138-42c9-94c5-4fd916c0125b X-Archives-Hash: 504b9fe8feb1c90c43ad2bce8666e06f commit: 027bac6855b66b7db997a9cf6b4e33ff7ee85ba2 Author: Alexander Berntsen <bernalex <AT> gentoo <DOT> org> AuthorDate: Sat Apr 5 12:58:14 2014 +0000 Commit: Alexander Berntsen <bernalex <AT> gentoo <DOT> org> CommitDate: Sat Apr 5 13:04:20 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=027bac68 depgraph: Improve mismatch checking (bug 505944) Make sure dep.atom and dep.atom.unevaluated_atom is set to something before checking for mismatch between them. This fixes a known bug where a typo like 'emerge -pvuDNworld' would produce a traceback if the user had a resume list. --- pym/_emerge/depgraph.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index abb70a7..737ed66 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2211,7 +2211,8 @@ class depgraph(object): # Display the specific atom from SetArg or # Package types. uneval = "" - if dep.atom is not dep.atom.unevaluated_atom: + if dep.atom and dep.atom.unevaluated_atom and \ + dep.atom is not dep.atom.unevaluated_atom: uneval = " (%s)" % (dep.atom.unevaluated_atom,) writemsg_level( "%s%s%s required by %s\n" %