summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-09-04 20:11:31 +0200
committerFabian Groffen <grobian@gentoo.org>2010-09-04 20:11:31 +0200
commitd9aead3e0b9bb7526619ada4895594b45ba4a981 (patch)
tree4d653471d0122ceda2a4035e4ef1890c2e123e33
parentf830074ae3b53412222286af7ac24d2a2cca94c1 (diff)
parent13ce64ff2f9dff1f5bdf9d2127e76793c41482b4 (diff)
downloadportage-d9aead3e0b9bb7526619ada4895594b45ba4a981.tar.gz
portage-d9aead3e0b9bb7526619ada4895594b45ba4a981.tar.bz2
portage-d9aead3e0b9bb7526619ada4895594b45ba4a981.zip
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage
-rw-r--r--pym/_emerge/show_invalid_depstring_notice.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/_emerge/show_invalid_depstring_notice.py b/pym/_emerge/show_invalid_depstring_notice.py
index 284c4e5f8..02fba03d0 100644
--- a/pym/_emerge/show_invalid_depstring_notice.py
+++ b/pym/_emerge/show_invalid_depstring_notice.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import logging
@@ -11,7 +11,9 @@ def show_invalid_depstring_notice(parent_node, depstring, error_msg):
msg1 = "\n\n!!! Invalid or corrupt dependency specification: " + \
"\n\n%s\n\n%s\n\n" % (error_msg, parent_node)
- p_type, _, p_key, p_status = parent_node
+ p_type = parent_node[0]
+ p_key = parent_node[2]
+ p_status = parent_node[3]
msg = []
if p_status == "nomerge":
category, pf = portage.catsplit(p_key)