From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 24 May 2008 21:23:39 +0000 (-0000)
Subject: Fix paren_reduce() so that it appropriately raises an InvalidDependString()
X-Git-Tag: v2.2_pre8~122
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=006ec38511eee165241af56d348c26589dce93ae;p=portage.git

Fix paren_reduce() so that it appropriately raises an InvalidDependString()
in some cases, instead of a nonsense AttributeError.

svn path=/main/trunk/; revision=10392
---

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index 998abfee7..5f858849b 100644
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -115,6 +115,9 @@ def paren_reduce(mystr,tokenize=1):
 				subsec = strip_empty(subsec.split(" "))
 				return [mylist+subsec,tail]
 			return mylist+[subsec],tail
+		if not isinstance(tail, basestring):
+			raise portage.exception.InvalidDependString(
+				"malformed syntax: '%s'" % mystr)
 		mystr = tail
 		if freesec:
 			if tokenize: