summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-09-25 20:07:08 +0000
committerZac Medico <zmedico@gentoo.org>2006-09-25 20:07:08 +0000
commit657ea257e7ae07b3858fd03ecf90f68466278ec3 (patch)
treec3ee9a46314bfbeddc1188fd3efceb1709fdd0eb
parentf147e28da888cb7c2ea80896ef9e183a9dfbf1d1 (diff)
downloadportage-657ea257e7ae07b3858fd03ecf90f68466278ec3.tar.gz
portage-657ea257e7ae07b3858fd03ecf90f68466278ec3.tar.bz2
portage-657ea257e7ae07b3858fd03ecf90f68466278ec3.zip
Check the dep_check return value and fail with a message if an error has occurred.
svn path=/main/trunk/; revision=4528
-rwxr-xr-xbin/emerge30
1 files changed, 13 insertions, 17 deletions
diff --git a/bin/emerge b/bin/emerge
index 9e17931c3..7a5a9f7b3 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1051,24 +1051,20 @@ class depgraph:
print "Reverse:", rev_deps
if soft_deps:
print "Soft:", soft_deps
-
- if not arg:
- #processing dependencies
- """ Call portage.dep_check to evaluate the use? conditionals and make sure all
- dependencies are satisfiable. """
- mycheck = portage.dep_check(depstring, self.mydbapi[myroot],
- pkgsettings, myuse=myuse,
- use_binaries=("--usepkgonly" in self.myopts),
- myroot=myroot, trees=self.trees, return_all_deps=True)
-
- if not mycheck[0]:
- mymerge=[]
- else:
- mymerge=mycheck[1]
- else:
- #we're processing a command-line argument; unconditionally merge it even if it's already merged
- mymerge=[depstring]
+ #processing dependencies
+ """ Call portage.dep_check to evaluate the use? conditionals and make sure all
+ dependencies are satisfiable. """
+ mycheck = portage.dep_check(depstring, self.mydbapi[myroot],
+ pkgsettings, myuse=myuse,
+ use_binaries=("--usepkgonly" in self.myopts),
+ myroot=myroot, trees=self.trees, return_all_deps=True)
+
+ if not mycheck[0]:
+ sys.stderr.write("\n\n%s\n\n" % mycheck[1])
+ sys.stderr.write("%s\n\n" % depstring)
+ return 0
+ mymerge = mycheck[1]
if myparent:
# In order to get past circular dependencies (in