diff -r ed510767c096 -r ec199ef0cfc6 eric6/MicroPython/CircuitPythonDevices.py
--- a/eric6/MicroPython/CircuitPythonDevices.py Tue Jul 23 19:43:14 2019 +0200
+++ b/eric6/MicroPython/CircuitPythonDevices.py Wed Jul 24 20:12:19 2019 +0200
@@ -135,20 +135,24 @@
path = '{0}:\\'.format(disk)
if (os.path.exists(path) and
getVolumeName(path) == 'CIRCUITPY'):
- return path
+ deviceDirectory = path
+ break
finally:
ctypes.windll.kernel32.SetErrorMode(oldMode)
else:
# we are on a Linux or macOS platform
- for mountCommand in ['mount', '/sbin/mount']:
+ for mountCommand in ['mount', '/sbin/mount', '/usr/sbin/mount']:
try:
mountOutput = check_output(mountCommand).splitlines()
mountedVolumes = [x.split()[2] for x in mountOutput]
for volume in mountedVolumes:
if volume.endswith(b'CIRCUITPY'):
deviceDirectory = volume.decode('utf-8')
+ break
+ if deviceDirectory:
+ break
except FileNotFoundError:
- next
+ pass
if deviceDirectory:
return deviceDirectory
