diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:34:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:34:37 +0000 |
| commit | 1f8bb32915f08192de2343eba8ccd86898432399 (patch) | |
| tree | 94cc074bb6882e4a1d644bc5dbab4c974dbfbea2 | |
| parent | b4b0b543c4fdbdd8fe8c1ece31e0145e7eb52d48 (diff) | |
| download | portage-1f8bb32915f08192de2343eba8ccd86898432399.tar.gz portage-1f8bb32915f08192de2343eba8ccd86898432399.tar.bz2 portage-1f8bb32915f08192de2343eba8ccd86898432399.zip | |
Fix KeyValuePairFileLoader to only split on '=' once and strip whitespace
for keys and values. (trunk r12742)
svn path=/main/branches/2.1.6/; revision=12991
| -rw-r--r-- | pym/portage/env/loaders.py | 6 |
1 files changed, 3 insertions, 3 deletions
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" |