From: Daid Date: Mon, 29 Oct 2012 09:59:19 +0000 (+0100) Subject: Filter out symlinks in /Volumes/ instead of filtering on name. X-Git-Tag: 13.03~221 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=24261360cf654a551a89f7449becee36faa16003;p=cura.git Filter out symlinks in /Volumes/ instead of filtering on name. --- diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py index c5dececa..0fe84e1d 100644 --- a/Cura/gui/preferencesDialog.py +++ b/Cura/gui/preferencesDialog.py @@ -1,7 +1,7 @@ from __future__ import absolute_import import __init__ -import wx, os, platform, types, string, glob +import wx, os, platform, types, string, glob, stat import ConfigParser from gui import configBase @@ -92,8 +92,8 @@ def getDrives(): bitmask >>= 1 if platform.system() == "Darwin": drives = [] - for volume in glob.glob('/Volumes/*/'): - if volume.endswith('/Macintosh HD/'): + for volume in glob.glob('/Volumes/*'): + if stat.S_ISLNK(os.lstat(volume).st_mode): continue drives.append(volume) return drives