Bug #275237 - If a directory exists in a location where a normal file is to
authorZac Medico <zmedico@gentoo.org>
Wed, 24 Jun 2009 03:18:01 +0000 (03:18 -0000)
committerZac Medico <zmedico@gentoo.org>
Wed, 24 Jun 2009 03:18:01 +0000 (03:18 -0000)
commitabf3368c778c9e615e5fa8acffcb2aa56fdd6a80
treec0c811143408b5c4069b6f9f4b91ece7fe523e30
parent12c879a68914db736c8193ccba1d52216e086b3c
Bug #275237 - If a directory exists in a location where a normal file is to
be merged, generate a config-protect filename for the file and merge it that
way. Thanks to Jonas Bernoulli <jonas@bernoulli.cc> for this patch.

svn path=/main/trunk/; revision=13679
pym/portage/dbapi/vartree.py