1 |
Author: zmedico |
2 |
Date: 2008-05-03 02:57:06 +0000 (Sat, 03 May 2008) |
3 |
New Revision: 10120 |
4 |
|
5 |
Modified: |
6 |
main/branches/2.1.2/bin/emerge |
7 |
Log: |
8 |
Fix depgraph.loadResumeCommand() to identify an unsatisfied dependency |
9 |
and invalidate the resume list in that case. (trunk r10119) |
10 |
|
11 |
|
12 |
Modified: main/branches/2.1.2/bin/emerge |
13 |
=================================================================== |
14 |
--- main/branches/2.1.2/bin/emerge 2008-05-03 02:55:16 UTC (rev 10119) |
15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-03 02:57:06 UTC (rev 10120) |
16 |
@@ -4950,8 +4950,19 @@ |
17 |
if isinstance(task, Package) and \ |
18 |
task.operation == "merge": |
19 |
self._add_pkg(task, None) |
20 |
- if not self._create_graph(): |
21 |
+ |
22 |
+ # Allow unsatisfied deps here to avoid showing a masking |
23 |
+ # message for an unsatisfied dep that isn't necessarily |
24 |
+ # masked. |
25 |
+ if not self._create_graph(allow_unsatisfied=True): |
26 |
return False |
27 |
+ if self._unsatisfied_deps: |
28 |
+ # This probably means that a required package |
29 |
+ # was dropped via --skipfirst. It makes the |
30 |
+ # resume list invalid, so convert it to a |
31 |
+ # PackageNotFound exception. |
32 |
+ raise portage_exception.PackageNotFound( |
33 |
+ self._unsatisfied_deps[0].atom) |
34 |
self._serialized_tasks_cache = None |
35 |
try: |
36 |
self.altlist() |
37 |
@@ -7675,10 +7686,10 @@ |
38 |
out.eerror("Error: The resume list contains packages that are no longer") |
39 |
out.eerror(" available to be emerged. Please restart/continue") |
40 |
out.eerror(" the merge operation manually.") |
41 |
+ else: |
42 |
+ if show_spinner: |
43 |
+ print "\b\b... done!" |
44 |
|
45 |
- if show_spinner: |
46 |
- print "\b\b... done!" |
47 |
- |
48 |
unsatisfied_block = False |
49 |
if success: |
50 |
mymergelist = mydepgraph.altlist() |
51 |
|
52 |
-- |
53 |
gentoo-commits@l.g.o mailing list |