From 3be3791673fcfa566f4173529676fe2d87c4f01f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 13 Oct 2007 05:40:35 +0000 Subject: [PATCH] Use os.listdir() instead of portage.listdir() in dblink.mergeme(). svn path=/main/trunk/; revision=8097 --- pym/portage/dbapi/vartree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.26.2