From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 17 Sep 2011 18:06:48 +0000 (-0700)
Subject: RepoConfigLoader: handle ValueError from shlex
X-Git-Tag: v2.2.0_alpha59~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc23070e710acecf9b0229f81a980719605d9409;p=portage.git

RepoConfigLoader: handle ValueError from shlex

This will handle the issue reported in bug #383269, comment #5.
---

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index 5cfe82f4a..8b1e641b2 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -194,7 +194,14 @@ class RepoConfigLoader(object):
 		if portdir:
 			portdir = normalize_path(portdir)
 			overlays.append(portdir)
-		port_ov = [normalize_path(i) for i in shlex_split(portdir_overlay)]
+		try:
+			port_ov = [normalize_path(i) for i in shlex_split(portdir_overlay)]
+		except ValueError as e:
+			#File "/usr/lib/python3.2/shlex.py", line 168, in read_token
+			#	raise ValueError("No closing quotation")
+			writemsg(_("!!! Invalid PORTDIR_OVERLAY:"
+				" %s: %s\n") % (e, portdir_overlay), noiselevel=-1)
+			port_ov = []
 		overlays.extend(port_ov)
 		default_repo_opts = {}
 		if prepos['DEFAULT'].aliases is not None: