Gentoo Archives: gentoo-commits

From: Sebastian Luther <SebastianLuther@×××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/
Date: Sun, 23 Feb 2014 21:38:14
Message-Id: 1393191447.8faaef43372b3a464a281b8e28314934ccc31866.few@gentoo
1 commit: 8faaef43372b3a464a281b8e28314934ccc31866
2 Author: Sebastian Luther <SebastianLuther <AT> gmx <DOT> de>
3 AuthorDate: Sun Feb 23 21:33:54 2014 +0000
4 Commit: Sebastian Luther <SebastianLuther <AT> gmx <DOT> de >
5 CommitDate: Sun Feb 23 21:37:27 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8faaef43
7
8 slot collision output: fix indent
9
10 ---
11 pym/_emerge/resolver/slot_collision.py | 1 +
12 1 file changed, 1 insertion(+)
13
14 diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
15 index c5936ad..baeab08 100644
16 --- a/pym/_emerge/resolver/slot_collision.py
17 +++ b/pym/_emerge/resolver/slot_collision.py
18 @@ -537,6 +537,7 @@ class slot_conflict_handler(object):
19 # redundant to display the atom attribute.
20 msg.append("%s\n" % (parent,))
21 elif isinstance(parent, AtomArg):
22 + msg.append(2*indent)
23 msg.append("%s (Argument)\n" % (atom,))
24 else:
25 # Display the specific atom from SetArg or