From c54b8ceb91306359d1b7eb2c4c4ae356a8a0a271 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 11 Nov 2015 17:33:12 +0200 Subject: Issue #7759: Fixed the mhlib module on filesystems that doesn't support link counting for directories. --- Lib/mhlib.py | 8 ++++---- Misc/NEWS | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Lib/mhlib.py b/Lib/mhlib.py index 856e878..46311fc 100644 --- a/Lib/mhlib.py +++ b/Lib/mhlib.py @@ -159,7 +159,7 @@ class MH: # Get the link count so we can avoid listing folders # that have no subfolders. nlinks = os.stat(fullname).st_nlink - if nlinks <= 2: + if nlinks == 2: return [] subfolders = [] subnames = os.listdir(fullname) @@ -171,7 +171,7 @@ class MH: # Stop looking for subfolders when # we've seen them all nlinks = nlinks - 1 - if nlinks <= 2: + if nlinks == 2: break subfolders.sort() return subfolders @@ -186,7 +186,7 @@ class MH: # Get the link count so we can avoid listing folders # that have no subfolders. nlinks = os.stat(fullname).st_nlink - if nlinks <= 2: + if nlinks == 2: return [] subfolders = [] subnames = os.listdir(fullname) @@ -203,7 +203,7 @@ class MH: # Stop looking for subfolders when # we've seen them all nlinks = nlinks - 1 - if nlinks <= 2: + if nlinks == 2: break subfolders.sort() return subfolders diff --git a/Misc/NEWS b/Misc/NEWS index 0c7e52b..265d2cf 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -49,6 +49,9 @@ Core and Builtins Library ------- +- Issue #7759: Fixed the mhlib module on filesystems that doesn't support + link counting for directories. + - Issue #892902: Fixed pickling recursive objects. - Issue #18010: Fix the pydoc GUI's search function to handle exceptions -- cgit v0.12