* [gentoo-commits] portage r12993 - in main/branches/2.1.6/pym/portage: env tests/env/config
@ 2009-03-11 6:35 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-03-11 6:35 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2009-03-11 06:35:18 +0000 (Wed, 11 Mar 2009)
New Revision: 12993
Modified:
main/branches/2.1.6/pym/portage/env/loaders.py
main/branches/2.1.6/pym/portage/tests/env/config/test_PortageModulesFile.py
Log:
Make KeyValuePairFileLoader store the values as a strings instead of a lists.
(trunk r12744)
Modified: main/branches/2.1.6/pym/portage/env/loaders.py
===================================================================
--- main/branches/2.1.6/pym/portage/env/loaders.py 2009-03-11 06:34:56 UTC (rev 12992)
+++ main/branches/2.1.6/pym/portage/env/loaders.py 2009-03-11 06:35:18 UTC (rev 12993)
@@ -275,7 +275,7 @@
% (line_num + 1, line))
return
key = split[0].strip()
- value = split[1].split()
+ value = split[1].strip()
if not key:
errors.setdefault(self.fname, []).append(
"Malformed key at line: %s, key %s"
Modified: main/branches/2.1.6/pym/portage/tests/env/config/test_PortageModulesFile.py
===================================================================
--- main/branches/2.1.6/pym/portage/tests/env/config/test_PortageModulesFile.py 2009-03-11 06:34:56 UTC (rev 12992)
+++ main/branches/2.1.6/pym/portage/tests/env/config/test_PortageModulesFile.py 2009-03-11 06:35:18 UTC (rev 12993)
@@ -22,7 +22,7 @@
f = PortageModulesFile(self.fname)
f.load()
for k in self.keys:
- self.assertEqual(f[k], [self.items[k]])
+ self.assertEqual(f[k], self.items[k])
for ik in self.invalid_keys:
self.assertEqual(False, ik in f)
self.NukeFile()
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-11 6:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-11 6:35 [gentoo-commits] portage r12993 - in main/branches/2.1.6/pym/portage: env tests/env/config Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox