From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 13 Oct 2007 05:40:35 +0000 (-0000)
Subject: Use os.listdir() instead of portage.listdir() in dblink.mergeme().
X-Git-Tag: v2.2_pre1~634
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3be3791673fcfa566f4173529676fe2d87c4f01f;p=portage.git

Use os.listdir() instead of portage.listdir() in dblink.mergeme().

svn path=/main/trunk/; revision=8097
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index a6eca8abe..dd982408b 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1992,7 +1992,7 @@ class dblink(object):
 		# this is supposed to merge a list of files.  There will be 2 forms of argument passing.
 		if isinstance(stufftomerge, basestring):
 			#A directory is specified.  Figure out protection paths, listdir() it and process it.
-			mergelist = listdir(join(srcroot, stufftomerge))
+			mergelist = os.listdir(join(srcroot, stufftomerge))
 			offset = stufftomerge
 		else:
 			mergelist = stufftomerge