merge: handle \r in file names for bug #384597
authorZac Medico <zmedico@gentoo.org>
Tue, 27 Sep 2011 16:46:02 +0000 (09:46 -0700)
committerZac Medico <zmedico@gentoo.org>
Tue, 27 Sep 2011 16:46:02 +0000 (09:46 -0700)
commit60c7ca4030839a728a5975ee01e28c0330cf33ae
treee84a308833f0ad01fc7d3ba48f641ccb0212bbb8
parentda782a6de61a3c0d9cd079c14d920852d2a4db9b
merge: handle \r in file names for bug #384597
pym/portage/dbapi/vartree.py