From owner-svn-ports-all@freebsd.org Tue Mar 29 11:01:37 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B413AE2357; Tue, 29 Mar 2016 11:01:37 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 488A61E4C; Tue, 29 Mar 2016 11:01:37 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2TB1aUI071669; Tue, 29 Mar 2016 11:01:36 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2TB1ap3071667; Tue, 29 Mar 2016 11:01:36 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201603291101.u2TB1ap3071667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 29 Mar 2016 11:01:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412100 - in head/deskutils/calibre: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Mar 2016 11:01:37 -0000 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: