summaryrefslogtreecommitdiff
path: root/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2016-03-28 20:18:50 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2016-03-28 20:18:50 +0000
commitb6f669d6a388dc04a39632408ad939b2bb7d85a4 (patch)
treef3fdd80b44eb5739ef57b13a0a7e58d732d89728 /deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py
parentRemove expired ports. (diff)
Patch calibre to correctly extract device info from the hal through
dbus. This allows it to correctly mount readers on FreeBSD. Reported by: avg@ (via email)
Notes
Notes: svn path=/head/; revision=412071
Diffstat (limited to '')
-rw-r--r--deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py b/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py
new file mode 100644
index 000000000000..ea963ad2cff7
--- /dev/null
+++ b/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py
@@ -0,0 +1,12 @@
+--- src/calibre/devices/usbms/device.py.orig 2016-03-11 03:07:28 UTC
++++ src/calibre/devices/usbms/device.py
+@@ -699,7 +699,8 @@ class Device(DeviceConfig, DevicePlugin)
+ d.manufacturer == objif.GetProperty('usb.vendor') and \
+ d.product == objif.GetProperty('usb.product') and \
+ d.serial == objif.GetProperty('usb.serial'):
+- dpaths = manager.FindDeviceStringMatch('storage.originating_device', path)
++ midpath = manager.FindDeviceStringMatch('info.parent', path)
++ dpaths = manager.FindDeviceStringMatch('storage.originating_device', midpath[0])
+ for dpath in dpaths:
+ # devif = dbus.Interface(bus.get_object('org.freedesktop.Hal', dpath), 'org.freedesktop.Hal.Device')
+ try: