| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-04 18:29:33 +0000 (Fri, 04 Apr 2008) |
| 3 |
New Revision: 9705 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Display the note referencing "masked packages" docs when there are |
| 9 |
installed masked packages to display. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-04-04 09:33:18 UTC (rev 9704) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-04-04 18:29:33 UTC (rev 9705) |
| 16 |
@@ -1158,7 +1158,7 @@ |
| 17 |
print "- "+cpv+" (masked by: "+", ".join(mreasons)+")" |
| 18 |
if comment and comment not in shown_comments: |
| 19 |
print filename+":" |
| 20 |
- print comment |
| 21 |
+ print comment, |
| 22 |
shown_comments.add(comment) |
| 23 |
portdb = root_config.trees["porttree"].dbapi |
| 24 |
for l in missing_licenses: |
| 25 |
@@ -2568,9 +2568,7 @@ |
| 26 |
from textwrap import wrap |
| 27 |
for line in wrap(msg, 75): |
| 28 |
print line |
| 29 |
- print |
| 30 |
- print "For more information, see MASKED PACKAGES section in the emerge man page or " |
| 31 |
- print "refer to the Gentoo Handbook." |
| 32 |
+ show_mask_docs() |
| 33 |
else: |
| 34 |
print "\nemerge: there are no ebuilds to satisfy "+green(xinfo)+"." |
| 35 |
if myparent: |
| 36 |
@@ -4104,17 +4102,6 @@ |
| 37 |
# TODO: Add generic support for "set problem" handlers so that |
| 38 |
# the below warnings aren't special cases for world only. |
| 39 |
|
| 40 |
- masked_packages = [] |
| 41 |
- for pkg, pkgsettings in self._masked_installed: |
| 42 |
- root_config = self.roots[pkg.root] |
| 43 |
- mreasons = get_masking_status(pkg, pkgsettings, root_config) |
| 44 |
- masked_packages.append((root_config, pkgsettings, |
| 45 |
- pkg.cpv, pkg.metadata, mreasons)) |
| 46 |
- if masked_packages: |
| 47 |
- sys.stderr.write("\n" + colorize("BAD", "!!!") + \ |
| 48 |
- " The following installed packages are masked:\n") |
| 49 |
- show_masked_packages(masked_packages) |
| 50 |
- |
| 51 |
if self._missing_args: |
| 52 |
world_problems = False |
| 53 |
if "world" in self._sets: |
| 54 |
@@ -4177,6 +4164,19 @@ |
| 55 |
msg.append("package.provided entry exists.\n\n") |
| 56 |
sys.stderr.write("".join(msg)) |
| 57 |
|
| 58 |
+ masked_packages = [] |
| 59 |
+ for pkg, pkgsettings in self._masked_installed: |
| 60 |
+ root_config = self.roots[pkg.root] |
| 61 |
+ mreasons = get_masking_status(pkg, pkgsettings, root_config) |
| 62 |
+ masked_packages.append((root_config, pkgsettings, |
| 63 |
+ pkg.cpv, pkg.metadata, mreasons)) |
| 64 |
+ if masked_packages: |
| 65 |
+ sys.stderr.write("\n" + colorize("BAD", "!!!") + \ |
| 66 |
+ " The following installed packages are masked:\n") |
| 67 |
+ show_masked_packages(masked_packages) |
| 68 |
+ show_mask_docs() |
| 69 |
+ print |
| 70 |
+ |
| 71 |
for pargs, kwargs in self._unsatisfied_deps_for_display: |
| 72 |
self._show_unsatisfied_dep(*pargs, **kwargs) |
| 73 |
|
| 74 |
@@ -5596,6 +5596,11 @@ |
| 75 |
print "http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?full=1#blocked" |
| 76 |
print |
| 77 |
|
| 78 |
+def show_mask_docs(): |
| 79 |
+ print |
| 80 |
+ print "For more information, see MASKED PACKAGES section in the emerge man page or " |
| 81 |
+ print "refer to the Gentoo Handbook." |
| 82 |
+ |
| 83 |
def action_sync(settings, trees, mtimedb, myopts, myaction): |
| 84 |
xterm_titles = "notitles" not in settings.features |
| 85 |
emergelog(xterm_titles, " === sync") |
| 86 |
|
| 87 |
-- |
| 88 |
gentoo-commits@l.g.o mailing list |
Archives