summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-12-20 04:09:31 +0000
committerZac Medico <zmedico@gentoo.org>2006-12-20 04:09:31 +0000
commit29b29204ec4f34aef1d215bb11c88afc62bb939b (patch)
treee0d69800684b461325ae1a326b9efd5e005a550b /bin/emerge
parentGive the user some advice whenever an invalid dependency string is encountered. (diff)
downloadportage-multirepo-29b29204ec4f34aef1d215bb11c88afc62bb939b.tar.gz
portage-multirepo-29b29204ec4f34aef1d215bb11c88afc62bb939b.tar.bz2
portage-multirepo-29b29204ec4f34aef1d215bb11c88afc62bb939b.zip
Fix the invalid dependency message so there's no confusion about which package has the problem.
svn path=/main/trunk/; revision=5333
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 9e4a1c54..1cb50119 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -802,8 +802,9 @@ def show_invalid_depstring_notice(parent_node, depstring, error_msg):
p_type, p_root, p_key, p_status = parent_node
msg = []
if p_status == "nomerge":
- msg.append("Portage is unable to process the dependencies of this ")
- msg.append("package. In order to correct this problem, the package ")
+ msg.append("Portage is unable to process the dependencies of the ")
+ msg.append("'%s' package. " % p_key)
+ msg.append("In order to correct this problem, the package ")
msg.append("should be uninstalled, reinstalled, or upgraded. ")
msg.append("As a temporary workaround, the --nodeps option can ")
msg.append("be used to ignore all dependencies.")