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

Nicer presentation of mount output

Browse Source
This commit is contained in:
Kovid Goyal 2025-04-22 08:26:47 +05:30
parent 8f6a1e0fdc
commit 6e4a865a25
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/__init__.py
View File

@ -113,7 +113,7 @@ def debug(ioreg_to_tmp=False, buf=None, plugins=None,
ioreg = None ioreg = None
if ismacos: if ismacos:
from calibre.devices.usbms.device import Device from calibre.devices.usbms.device import Device
mount = '\n'.join(repr(x) for x in Device.osx_run_mount().splitlines()) mount = Device.osx_run_mount()
drives = pprint.pformat(Device.osx_get_usb_drives()) drives = pprint.pformat(Device.osx_get_usb_drives())
ioreg = 'Output from mount:\n'+mount+'\n\n' ioreg = 'Output from mount:\n'+mount+'\n\n'
ioreg += 'Output from osx_get_usb_drives:\n'+drives+'\n\n' ioreg += 'Output from osx_get_usb_drives:\n'+drives+'\n\n'

3
src/calibre/devices/usbms/device.py
View File

@ -347,8 +347,7 @@ class Device(DeviceConfig, DevicePlugin):
def osx_run_mount(cls): def osx_run_mount(cls):
for i in range(3): for i in range(3):
try: try:
return subprocess.Popen('mount', return subprocess.Popen('mount', stdout=subprocess.PIPE).communicate()[0].decode('utf-8', 'replace')
stdout=subprocess.PIPE).communicate()[0]
except OSError: # Probably an interrupted system call except OSError: # Probably an interrupted system call
if i == 2: if i == 2:
raise raise