| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-29 07:55:08 +0000 (Sat, 29 Mar 2008) |
| 3 |
New Revision: 9602 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Bug #214691 - Move display of depgraph problems from xcreate() to |
| 9 |
display_problems() so that they are shown _after_ the merge list |
| 10 |
where they are easier/likely to be seen by the user. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-03-29 07:08:00 UTC (rev 9601) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-03-29 07:55:08 UTC (rev 9602) |
| 17 |
@@ -1530,6 +1530,7 @@ |
| 18 |
self._missing_args = [] |
| 19 |
self._masked_installed = [] |
| 20 |
self._unsatisfied_deps_for_display = [] |
| 21 |
+ self._world_problems = False |
| 22 |
|
| 23 |
def _show_slot_collision_notice(self): |
| 24 |
"""Show an informational message advising the user to mask one of the |
| 25 |
@@ -3072,7 +3073,6 @@ |
| 26 |
portdb = self.trees[self.target_root]["porttree"].dbapi |
| 27 |
bindb = self.trees[self.target_root]["bintree"].dbapi |
| 28 |
bindb_keys = list(bindb._aux_cache_keys) |
| 29 |
- world_problems = False |
| 30 |
|
| 31 |
root_config = self.roots[self.target_root] |
| 32 |
world_set = root_config.sets["world"] |
| 33 |
@@ -3083,10 +3083,10 @@ |
| 34 |
self._sets["world"] = world_set |
| 35 |
for x in world_set: |
| 36 |
if not portage.isvalidatom(x): |
| 37 |
- world_problems = True |
| 38 |
+ self._world_problems = True |
| 39 |
continue |
| 40 |
elif not vardb.match(x): |
| 41 |
- world_problems = True |
| 42 |
+ self._world_problems = True |
| 43 |
available = False |
| 44 |
if "--usepkgonly" not in self.myopts and \ |
| 45 |
portdb.match(x): |
| 46 |
@@ -3105,7 +3105,6 @@ |
| 47 |
for myatom in mylist: |
| 48 |
self._set_atoms.add(myatom) |
| 49 |
|
| 50 |
- missing_atoms = self._missing_args |
| 51 |
for mydep in mylist: |
| 52 |
try: |
| 53 |
if not self.select_dep( |
| 54 |
@@ -3113,32 +3112,11 @@ |
| 55 |
print >> sys.stderr, "\n\n!!! Problem resolving dependencies for", mydep |
| 56 |
return 0 |
| 57 |
except portage_exception.PackageNotFound: |
| 58 |
- missing_atoms.append(mydep) |
| 59 |
+ self._missing_args.append(mydep) |
| 60 |
|
| 61 |
- masked_packages = [] |
| 62 |
- for pkg, pkgsettings in self._masked_installed: |
| 63 |
- root_config = self.roots[pkg.root] |
| 64 |
- mreasons = get_masking_status(pkg, pkgsettings, root_config) |
| 65 |
- masked_packages.append((root_config, pkgsettings, |
| 66 |
- pkg.cpv, pkg.metadata, mreasons)) |
| 67 |
- if masked_packages: |
| 68 |
- sys.stderr.write("\n" + colorize("BAD", "!!!") + \ |
| 69 |
- " The following installed packages are masked:\n") |
| 70 |
- show_masked_packages(masked_packages) |
| 71 |
- |
| 72 |
if not self.validate_blockers(): |
| 73 |
return False |
| 74 |
|
| 75 |
- if world_problems: |
| 76 |
- print >> sys.stderr, "\n!!! Problems have been detected with your world file" |
| 77 |
- print >> sys.stderr, "!!! Please run "+green("emaint --check world")+"\n" |
| 78 |
- |
| 79 |
- if missing_atoms: |
| 80 |
- print >> sys.stderr, "\n" + colorize("BAD", "!!!") + \ |
| 81 |
- " Ebuilds for the following packages are either all" |
| 82 |
- print >> sys.stderr, colorize("BAD", "!!!") + " masked or don't exist:" |
| 83 |
- print >> sys.stderr, " ".join(missing_atoms) + "\n" |
| 84 |
- |
| 85 |
return 1 |
| 86 |
|
| 87 |
def display(self, mylist, favorites=[], verbosity=None): |
| 88 |
@@ -3783,6 +3761,30 @@ |
| 89 |
|
| 90 |
self._show_slot_collision_notice() |
| 91 |
|
| 92 |
+ masked_packages = [] |
| 93 |
+ for pkg, pkgsettings in self._masked_installed: |
| 94 |
+ root_config = self.roots[pkg.root] |
| 95 |
+ mreasons = get_masking_status(pkg, pkgsettings, root_config) |
| 96 |
+ masked_packages.append((root_config, pkgsettings, |
| 97 |
+ pkg.cpv, pkg.metadata, mreasons)) |
| 98 |
+ if masked_packages: |
| 99 |
+ sys.stderr.write("\n" + colorize("BAD", "!!!") + \ |
| 100 |
+ " The following installed packages are masked:\n") |
| 101 |
+ show_masked_packages(masked_packages) |
| 102 |
+ |
| 103 |
+ if self._world_problems: |
| 104 |
+ sys.stderr.write("\n!!! Problems have been " + \ |
| 105 |
+ "detected with your world file\n") |
| 106 |
+ sys.stderr.write("!!! Please run " + \ |
| 107 |
+ green("emaint --check world")+"\n\n") |
| 108 |
+ |
| 109 |
+ if self._missing_args: |
| 110 |
+ sys.stderr.write("\n" + colorize("BAD", "!!!") + \ |
| 111 |
+ " Ebuilds for the following packages are either all\n") |
| 112 |
+ sys.stderr.write(colorize("BAD", "!!!") + \ |
| 113 |
+ " masked or don't exist:\n") |
| 114 |
+ sys.stderr.write(" ".join(self._missing_args) + "\n") |
| 115 |
+ |
| 116 |
if self._pprovided_args: |
| 117 |
arg_refs = {} |
| 118 |
for arg_atom in self._pprovided_args: |
| 119 |
|
| 120 |
-- |
| 121 |
gentoo-commits@l.g.o mailing list |
Archives