From 522a7e522d8d59344f85cef9245b2dc3695bc166 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Wed, 20 Feb 2008 00:42:29 +0000 Subject: [PATCH] fix_detecting_mountpoint_in_filelist.patch by Moritz Venn --- lib/python/Components/FileList.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index d842cfef..e6e072cd 100644 --- a/lib/python/Components/FileList.py +++ b/lib/python/Components/FileList.py @@ -78,7 +78,20 @@ class FileList(MenuList): # if we are just entering from the list of mount points: if self.current_directory is None: - self.mount_point = directory + if directory is None: + self.mount_point = None + else: + # Sort Mountpoints by length (longest first) + sortedp = harddiskmanager.getMountedPartitions() + sortedp.sort(key=lambda p: 0 - len(p.mountpoint)) + + # Search for the longest matching mp (should at least match /) + for p in sortedp: + if directory.startswith(p.mountpoint): + self.mount_point = p.mountpoint + if p.mountpoint != "/": + self.mount_point += "/" + break self.current_directory = directory directories = [] files = [] -- 2.30.2