diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-13 05:40:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-13 05:40:35 +0000 |
| commit | 3be3791673fcfa566f4173529676fe2d87c4f01f (patch) | |
| tree | 1a256aa7bbb574f57555b645caa2e12a4ba71832 /pym | |
| parent | 3ab7f2893f32670bcab7bb4c5faf2cfcb9e90cf6 (diff) | |
| download | portage-3be3791673fcfa566f4173529676fe2d87c4f01f.tar.gz portage-3be3791673fcfa566f4173529676fe2d87c4f01f.tar.bz2 portage-3be3791673fcfa566f4173529676fe2d87c4f01f.zip | |
Use os.listdir() instead of portage.listdir() in dblink.mergeme().
svn path=/main/trunk/; revision=8097
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |