| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-04 01:48:25 +0000 (Sun, 04 May 2008) |
| 3 |
New Revision: 10152 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Fix spelling of _show_unsatisfied_blockers(). (trunk r10151) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/bin/emerge |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/bin/emerge 2008-05-04 01:48:04 UTC (rev 10151) |
| 14 |
+++ main/branches/2.1.2/bin/emerge 2008-05-04 01:48:25 UTC (rev 10152) |
| 15 |
@@ -4055,7 +4055,7 @@ |
| 16 |
display_list.reverse() |
| 17 |
self.display(display_list) |
| 18 |
|
| 19 |
- def _show_unsatisied_blockers(self, blockers): |
| 20 |
+ def _show_unsatisfied_blockers(self, blockers): |
| 21 |
self._show_merge_list() |
| 22 |
msg = "Error: The above package list contains " + \ |
| 23 |
"packages which cannot be installed " + \ |
| 24 |
@@ -4764,7 +4764,7 @@ |
| 25 |
# The user is only notified of a slot conflict if |
| 26 |
# there are no unresolvable blocker conflicts. |
| 27 |
if self._unsatisfied_blockers_for_display is not None: |
| 28 |
- self._show_unsatisied_blockers( |
| 29 |
+ self._show_unsatisfied_blockers( |
| 30 |
self._unsatisfied_blockers_for_display) |
| 31 |
else: |
| 32 |
self._show_slot_collision_notice() |
| 33 |
|
| 34 |
-- |
| 35 |
gentoo-commits@l.g.o mailing list |
Archives