1 |
Author: zmedico |
2 |
Date: 2008-07-04 13:58:30 +0000 (Fri, 04 Jul 2008) |
3 |
New Revision: 10928 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
In --keep-going mode, display the new merge list when appropriate. |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/_emerge/__init__.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-04 13:20:13 UTC (rev 10927) |
14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-04 13:58:30 UTC (rev 10928) |
15 |
@@ -7603,6 +7603,17 @@ |
16 |
""" |
17 |
print colorize("GOOD", "*** Resuming merge...") |
18 |
|
19 |
+ if self._show_list(): |
20 |
+ if "--tree" in self.myopts: |
21 |
+ portage.writemsg_stdout("\n" + \ |
22 |
+ darkgreen("These are the packages that " + \ |
23 |
+ "would be merged, in reverse order:\n\n")) |
24 |
+ |
25 |
+ else: |
26 |
+ portage.writemsg_stdout("\n" + \ |
27 |
+ darkgreen("These are the packages that " + \ |
28 |
+ "would be merged, in order:\n\n")) |
29 |
+ |
30 |
show_spinner = "--quiet" not in self.myopts and \ |
31 |
"--nodeps" not in self.myopts |
32 |
|
33 |
@@ -7617,8 +7628,14 @@ |
34 |
if show_spinner: |
35 |
print "\b\b... done!" |
36 |
|
37 |
+ if self._show_list(): |
38 |
+ mylist = mydepgraph.altlist() |
39 |
+ if "--tree" in self.myopts: |
40 |
+ mylist.reverse() |
41 |
+ mydepgraph.display(mylist, favorites=self._favorites) |
42 |
+ |
43 |
+ mydepgraph.display_problems() |
44 |
if not success: |
45 |
- mydepgraph.display_problems() |
46 |
return (None, None) |
47 |
|
48 |
mylist = mydepgraph.altlist() |
49 |
@@ -7626,6 +7643,14 @@ |
50 |
mydepgraph.break_refs(dropped_tasks) |
51 |
return (mylist, dropped_tasks) |
52 |
|
53 |
+ def _show_list(self): |
54 |
+ myopts = self.myopts |
55 |
+ if "--quiet" not in myopts and \ |
56 |
+ ("--ask" in myopts or "--tree" in myopts or \ |
57 |
+ "--verbose" in myopts): |
58 |
+ return True |
59 |
+ return False |
60 |
+ |
61 |
def _register(self, f, eventmask, handler): |
62 |
""" |
63 |
@rtype: Integer |
64 |
|
65 |
-- |
66 |
gentoo-commits@l.g.o mailing list |