summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-12-30 03:34:30 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-12-30 03:34:30 +0000
commit5c046815fc92b4745d3941be989f18fbde710a1e (patch)
tree9de7bcebcd33c93e6aa3a13ffe8d36274008c731
parent4626e87c6948e6c8160be935c27b3d3431149f86 (diff)
downloadportage-5c046815fc92b4745d3941be989f18fbde710a1e.tar.gz
portage-5c046815fc92b4745d3941be989f18fbde710a1e.tar.bz2
portage-5c046815fc92b4745d3941be989f18fbde710a1e.zip
Don't print emaint warning for masked/non-existant packages. When using
--verbose, print a warning for those packages. svn path=/main/trunk/; revision=2493
-rwxr-xr-xbin/emerge8
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index 99fb2e894..566556c90 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1432,6 +1432,7 @@ class depgraph:
newlist.append(atom)
mylist = newlist
+ missing_atoms = []
for mydep in mylist:
try:
if not self.select_dep(portage.root, mydep, raise_on_missing=True):
@@ -1440,12 +1441,17 @@ class depgraph:
except ValueError:
if "--debug" in myopts:
raise
- world_problems = True
+ missing_atoms.append(mydep)
if world_problems:
print "\n!!! Problems have been detected with your world file"
print "!!! Please run "+green("emaint --check world")+"\n"
+ if missing_atoms and "--verbose" in myopts:
+ print "\n!!! Packages for the following atoms are either all"
+ print "!!! masked or don't exist:"
+ print " ".join(missing_atoms) + "\n"
+
return 1
def match(self,mydep,myroot=portage.root,mykey=None):