From e45dadd04b850c9af0b20b5d19d7c89d4a935b0d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 20 Apr 2007 21:32:23 +0000 Subject: For bug #175344, handle a potential InvalidDependString exception when parsing PROVIDE. (trunk r6418:6419) svn path=/main/branches/2.1.2/; revision=6420 --- bin/emerge | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 96c288c0e..ddbc6b19d 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1540,8 +1540,14 @@ class depgraph: if p_status == "merge": # Update old-style virtuals if this package provides any. # These are needed for dep_virtual calls inside dep_check. - self.pkgsettings[p_root].setinst(p_key, - self.trees[p_root][self.pkg_tree_map[p_type]].dbapi) + p_db = self.trees[p_root][self.pkg_tree_map[p_type]].dbapi + try: + self.pkgsettings[p_root].setinst(p_key, p_db) + except portage_exception.InvalidDependString, e: + provide = p_db.aux_get(p_key, ["PROVIDE"])[0] + show_invalid_depstring_notice(myparent, provide, str(e)) + del e + return 0 if "--debug" in self.myopts: print "Candidates:",mymerge -- cgit v1.2.3-1-g7c22