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 60AB1138E66 for ; Sun, 23 Feb 2014 21:38:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED2F1E0A5A; Sun, 23 Feb 2014 21:38:13 +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 8B8A0E0A5A for ; Sun, 23 Feb 2014 21:38:13 +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 9DD2933F6E1 for ; Sun, 23 Feb 2014 21:38:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 0E1FA188A2 for ; Sun, 23 Feb 2014 21:38:10 +0000 (UTC) From: "Sebastian Luther" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Luther" Message-ID: <1393191447.8faaef43372b3a464a281b8e28314934ccc31866.few@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/resolver/slot_collision.py X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: few X-VCS-Committer-Name: Sebastian Luther X-VCS-Revision: 8faaef43372b3a464a281b8e28314934ccc31866 X-VCS-Branch: master Date: Sun, 23 Feb 2014 21:38:10 +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: 05b76a59-6b2c-4a30-b507-40c2c9341570 X-Archives-Hash: c4855f0309c8b6e0ae78b58280b93432 commit: 8faaef43372b3a464a281b8e28314934ccc31866 Author: Sebastian Luther gmx de> AuthorDate: Sun Feb 23 21:33:54 2014 +0000 Commit: Sebastian Luther gmx de > CommitDate: Sun Feb 23 21:37:27 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8faaef43 slot collision output: fix indent --- pym/_emerge/resolver/slot_collision.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index c5936ad..baeab08 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -537,6 +537,7 @@ class slot_conflict_handler(object): # redundant to display the atom attribute. msg.append("%s\n" % (parent,)) elif isinstance(parent, AtomArg): + msg.append(2*indent) msg.append("%s (Argument)\n" % (atom,)) else: # Display the specific atom from SetArg or