Date: Tue, 29 Mar 2016 11:01:36 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412100 - in head/deskutils/calibre: . files Message-ID: <201603291101.u2TB1ap3071667@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Tue Mar 29 11:01:36 2016 New Revision: 412100 URL: https://svnweb.freebsd.org/changeset/ports/412100 Log: Update patch to match the code accepted by upstream for merging. Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Tue Mar 29 10:17:18 2016 (r412099) +++ head/deskutils/calibre/Makefile Tue Mar 29 11:01:36 2016 (r412100) @@ -3,7 +3,7 @@ PORTNAME= calibre PORTVERSION= 2.53.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ Modified: head/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py ============================================================================== --- head/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py Tue Mar 29 10:17:18 2016 (r412099) +++ head/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py Tue Mar 29 11:01:36 2016 (r412100) @@ -6,7 +6,7 @@ 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]) ++ dpaths = manager.FindDeviceStringMatch('storage.originating_device', path) + 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603291101.u2TB1ap3071667>