Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13853 - main/trunk/pym/_emerge
Date: Tue, 28 Jul 2009 23:32:22
Message-Id: E1MVw9c-0001RZ-CS@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-07-28 23:32:19 +0000 (Tue, 28 Jul 2009)
3 New Revision: 13853
4
5 Modified:
6 main/trunk/pym/_emerge/depgraph.py
7 Log:
8 Remove redundant loop inside depgraph._show_missed_update_slot_conflicts().
9
10
11 Modified: main/trunk/pym/_emerge/depgraph.py
12 ===================================================================
13 --- main/trunk/pym/_emerge/depgraph.py 2009-07-28 23:27:52 UTC (rev 13852)
14 +++ main/trunk/pym/_emerge/depgraph.py 2009-07-28 23:32:19 UTC (rev 13853)
15 @@ -351,19 +351,19 @@
16 msg.append(str(pkg))
17
18 msg.append(" conflicts with\n")
19 - for parent, atom in parent_atoms:
20 - msg.append(2*indent)
21 - if isinstance(parent,
22 - (PackageArg, AtomArg)):
23 - # For PackageArg and AtomArg types, it's
24 - # redundant to display the atom attribute.
25 - msg.append(str(parent))
26 - else:
27 - # Display the specific atom from SetArg or
28 - # Package types.
29 - msg.append("%s required by %s" % (atom, parent))
30 - msg.append("\n")
31 + msg.append(2*indent)
32 + if isinstance(parent,
33 + (PackageArg, AtomArg)):
34 + # For PackageArg and AtomArg types, it's
35 + # redundant to display the atom attribute.
36 + msg.append(str(parent))
37 + else:
38 + # Display the specific atom from SetArg or
39 + # Package types.
40 + msg.append("%s required by %s" % (atom, parent))
41 msg.append("\n")
42 + msg.append("\n")
43 +
44 sys.stderr.write("".join(msg))
45 sys.stderr.flush()