From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 2 Mar 2009 23:51:12 +0000 (-0000)
Subject: Fix KeyValuePairFileLoader to only split on '=' once and strip whitespace
X-Git-Tag: v2.2_rc24~73
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51e6b1909a267810fe01e0303bbb88d68b36af15;p=portage.git

Fix KeyValuePairFileLoader to only split on '=' once and strip whitespace
for keys and values.

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

diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py
index b23c7f393..53566625c 100644
--- a/pym/portage/env/loaders.py
+++ b/pym/portage/env/loaders.py
@@ -268,14 +268,14 @@ class KeyValuePairFileLoader(FileLoader):
 			return
 		if not len(line): # skip empty lines
 			return
-		split = line.split('=')
+		split = line.split('=', 1)
 		if len(split) < 2:
 			errors.setdefault(self.fname, []).append(
 				"Malformed data at line: %s, data %s"
 				% (line_num + 1, line))
 			return
-		key = split[0]
-		value = split[1:]
+		key = split[0].strip()
+		value = split[1].split()
 		if not key:
 			errors.setdefault(self.fname, []).append(
 				"Malformed key at line: %s, key %s"