support for a final post-destroy value

[enigma2.git] / lib / python / Components / Scanner.py

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index 17c4aaa8d062b361dbbdc09871502cb4ae38285a..813c09f896884301254512a67ee334d126746e60 100644 (file)
--- a/lib/python/Components/Scanner.py
+++ b/lib/python/Components/Scanner.py
@@ -114,13 +114,10 @@ def scanDevice(mountpoint):
 
        # ...then remove with_subdir=False when same path exists
        # with with_subdirs=True
 
        # ...then remove with_subdir=False when same path exists
        # with with_subdirs=True

-       for p in set(paths_to_scan):
+       for p in paths_to_scan:

                if p.with_subdirs == True and ScanPath(path=p.path) in paths_to_scan:
                        paths_to_scan.remove(ScanPath(path=p.path))
 
                if p.with_subdirs == True and ScanPath(path=p.path) in paths_to_scan:
                        paths_to_scan.remove(ScanPath(path=p.path))
 

-       # convert to list
-       paths_to_scan = list(paths_to_scan)
-

        from Components.Harddisk import harddiskmanager 
        blockdev = mountpoint.rstrip("/").rsplit('/',1)[-1]
        error, blacklisted, removable, is_cdrom, partitions, medium_found = harddiskmanager.getBlockDevInfo(blockdev)
        from Components.Harddisk import harddiskmanager 
        blockdev = mountpoint.rstrip("/").rsplit('/',1)[-1]
        error, blacklisted, removable, is_cdrom, partitions, medium_found = harddiskmanager.getBlockDevInfo(blockdev)