Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix device detection on OS X when users have a customized environment.plist

Browse Source
This commit is contained in:
Kovid Goyal 2008-12-18 13:20:38 -08:00
parent 30a11fdfaa
commit 42e6fb932b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/devices/prs505/driver.py
View File

@ -108,7 +108,10 @@ class PRS505(Device):
@classmethod @classmethod
def get_osx_mountpoints(cls, raw=None): def get_osx_mountpoints(cls, raw=None):
if raw is None: if raw is None:
raw = subprocess.Popen('ioreg -w 0 -S -c IOMedia'.split(), ioreg = '/usr/sbin/ioreg'
if not os.access(ioreg, os.X_OK):
ioreg = 'ioreg'
raw = subprocess.Popen((ioreg+' -w 0 -S -c IOMedia').split(),
stdout=subprocess.PIPE).stdout.read() stdout=subprocess.PIPE).stdout.read()
lines = raw.splitlines() lines = raw.splitlines()
names = {} names = {}