Fix listDirectory for symlink to directory.

develop
Mike Hiretsky 14 years ago
parent bf568f9b4a
commit ea525ea1f6

@ -770,8 +770,10 @@ def getFilesCount(directory):
def listDirectory(directory):
"""Get files from directory, if it exists"""
if os.path.exists(directory) and \
stat.S_ISDIR(os.lstat(directory)[stat.ST_MODE]) and \
os.access(directory,os.R_OK):
os.access(directory,os.R_OK) and \
(stat.S_ISDIR(os.lstat(directory)[stat.ST_MODE]) or
(stat.S_ISLNK(os.lstat(directory)[stat.ST_MODE]) and
stat.S_ISDIR(os.lstat(os.readlink(directory))[stat.ST_MODE]))):
return os.listdir(directory)
else:
return []

Loading…
Cancel
Save