summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-09-12 21:24:44 +0000
committerZac Medico <zmedico@gentoo.org>2009-09-12 21:24:44 +0000
commit4dd359e876b6bcac2bddcb5eb2c508ca2fb67f66 (patch)
treed0e8e9c80984dd1fe57e7131f35331313f06b2c6
parent7879445e8a1a907d64faa68103c108f44a8630d3 (diff)
downloadportage-4dd359e876b6bcac2bddcb5eb2c508ca2fb67f66.tar.gz
portage-4dd359e876b6bcac2bddcb5eb2c508ca2fb67f66.tar.bz2
portage-4dd359e876b6bcac2bddcb5eb2c508ca2fb67f66.zip
Fix bug in _expand_new_virtuals() reported by Arfrever:
TypeError: coercing to Unicode: need string or buffer, Atom found svn path=/main/trunk/; revision=14237
-rw-r--r--pym/portage/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index cb6cdb6fa..b3e44002a 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7561,7 +7561,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
if repoman:
# TODO: Add PROVIDE check for repoman.
for y in mychoices:
- a.append(portage.dep.Atom(x.replace(mykey, y, 1)))
+ a.append(portage.dep.Atom(x.replace(mykey, str(y.cp), 1)))
else:
for y in mychoices:
new_atom = portage.dep.Atom(