| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-04 18:43:29 +0000 (Fri, 04 Apr 2008) |
| 3 |
New Revision: 9707 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Display the note referencing "masked packages" docs when there are |
| 9 |
installed masked packages to display. (trunk r9704:9706) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-04-04 18:40:28 UTC (rev 9706) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-04-04 18:43:29 UTC (rev 9707) |
| 16 |
@@ -2198,8 +2198,7 @@ |
| 17 |
for line in wrap(msg, 75): |
| 18 |
print line |
| 19 |
print |
| 20 |
- print "For more information, see MASKED PACKAGES section in the emerge man page or " |
| 21 |
- print "refer to the Gentoo Handbook." |
| 22 |
+ show_mask_docs() |
| 23 |
else: |
| 24 |
print "\nemerge: there are no ebuilds to satisfy "+green(xinfo)+"." |
| 25 |
if myparent: |
| 26 |
@@ -3815,17 +3814,6 @@ |
| 27 |
|
| 28 |
self._show_slot_collision_notice() |
| 29 |
|
| 30 |
- masked_packages = [] |
| 31 |
- for pkg, pkgsettings in self._masked_installed: |
| 32 |
- root_config = self.roots[pkg.root] |
| 33 |
- mreasons = get_masking_status(pkg, pkgsettings, root_config) |
| 34 |
- masked_packages.append((root_config, pkgsettings, |
| 35 |
- pkg.cpv, pkg.metadata, mreasons)) |
| 36 |
- if masked_packages: |
| 37 |
- sys.stderr.write("\n" + colorize("BAD", "!!!") + \ |
| 38 |
- " The following installed packages are masked:\n") |
| 39 |
- show_masked_packages(masked_packages) |
| 40 |
- |
| 41 |
if self._world_problems: |
| 42 |
sys.stderr.write("\n!!! Problems have been " + \ |
| 43 |
"detected with your world file\n") |
| 44 |
@@ -3876,6 +3864,19 @@ |
| 45 |
msg.append("package.provided entry exists.\n\n") |
| 46 |
sys.stderr.write("".join(msg)) |
| 47 |
|
| 48 |
+ masked_packages = [] |
| 49 |
+ for pkg, pkgsettings in self._masked_installed: |
| 50 |
+ root_config = self.roots[pkg.root] |
| 51 |
+ mreasons = get_masking_status(pkg, pkgsettings, root_config) |
| 52 |
+ masked_packages.append((root_config, pkgsettings, |
| 53 |
+ pkg.cpv, pkg.metadata, mreasons)) |
| 54 |
+ if masked_packages: |
| 55 |
+ sys.stderr.write("\n" + colorize("BAD", "!!!") + \ |
| 56 |
+ " The following installed packages are masked:\n") |
| 57 |
+ show_masked_packages(masked_packages) |
| 58 |
+ show_mask_docs() |
| 59 |
+ print |
| 60 |
+ |
| 61 |
for pargs, kwargs in self._unsatisfied_deps_for_display: |
| 62 |
self._show_unsatisfied_dep(*pargs, **kwargs) |
| 63 |
|
| 64 |
@@ -5145,6 +5146,10 @@ |
| 65 |
print "http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?full=1#blocked" |
| 66 |
print |
| 67 |
|
| 68 |
+def show_mask_docs(): |
| 69 |
+ print "For more information, see MASKED PACKAGES section in the emerge man page or " |
| 70 |
+ print "refer to the Gentoo Handbook." |
| 71 |
+ |
| 72 |
def action_sync(settings, trees, mtimedb, myopts, myaction): |
| 73 |
xterm_titles = "notitles" not in settings.features |
| 74 |
emergelog(xterm_titles, " === sync") |
| 75 |
|
| 76 |
-- |
| 77 |
gentoo-commits@l.g.o mailing list |
Archives