aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components/Scanner.py
diff options
context:
space:
mode:
authorFraxinas <andreas.frisch@multimedia-labs.de>2009-03-02 17:32:02 +0100
committerFraxinas <andreas.frisch@multimedia-labs.de>2009-03-02 17:32:02 +0100
commite68a1617b7c1efbedf8b28309943dd7669daaad0 (patch)
tree2c45f065213b18f3a2c8a5e8666977f9bbff230d /lib/python/Components/Scanner.py
parent8d2545bc513280abe52d9c0fc2b704de3729a11e (diff)
parentfe12fe9e0ab3a4f9751b67c0aa3751d5864784ba (diff)
downloadenigma2-e68a1617b7c1efbedf8b28309943dd7669daaad0.tar.gz
enigma2-e68a1617b7c1efbedf8b28309943dd7669daaad0.zip
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Components/Scanner.py')
-rw-r--r--lib/python/Components/Scanner.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index 17c4aaa8..813c09f8 100644
--- 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
- 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))
- # 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)