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 a6eca8abe8924346d8cf8f3b8e3500aef2652a34..dd982408b330b66bec6875aab8d8418e6bcd24ee 100644 (file)
--- 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