From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F4C5138330 for ; Fri, 7 Oct 2016 15:55:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 966A0E09FC; Fri, 7 Oct 2016 15:55:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A382E09FC for ; Fri, 7 Oct 2016 15:55:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D371C34135B for ; Fri, 7 Oct 2016 15:55:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E086F24AC for ; Fri, 7 Oct 2016 15:55:22 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1475855715.01d5d3de1190a8355e8d42e739bed44dd427a633.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/rospkg/files/norecurse.patch dev-python/rospkg/rospkg-1.0.41-r1.ebuild dev-python/rospkg/rospkg-1.0.41.ebuild dev-python/rospkg/rospkg-9999.ebuild X-VCS-Directories: dev-python/rospkg/ dev-python/rospkg/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 01d5d3de1190a8355e8d42e739bed44dd427a633 X-VCS-Branch: master Date: Fri, 7 Oct 2016 15:55:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 21b89f70-fe9a-47cf-bfdf-ad05fb898986 X-Archives-Hash: 6a8da690cfdeb7ac8ebf0e317006c356 commit: 01d5d3de1190a8355e8d42e739bed44dd427a633 Author: Alexis Ballier gentoo org> AuthorDate: Fri Oct 7 15:54:09 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Fri Oct 7 15:55:15 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d5d3de dev-python/rospkg: drop norecurse patch now that ROS_PACKAGE_PATH is installed in /usr/share/ros_packages. Package-Manager: portage-2.3.1 dev-python/rospkg/files/norecurse.patch | 64 ---------------------- ...ospkg-1.0.41.ebuild => rospkg-1.0.41-r1.ebuild} | 11 ---- dev-python/rospkg/rospkg-9999.ebuild | 13 +---- 3 files changed, 1 insertion(+), 87 deletions(-) diff --git a/dev-python/rospkg/files/norecurse.patch b/dev-python/rospkg/files/norecurse.patch deleted file mode 100644 index 4b7aae9..00000000 --- a/dev-python/rospkg/files/norecurse.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit c2e06e0ea0b4a1cbb67049ab77a80f53646fb0b2 -Author: Alexis Ballier -Date: Tue Dec 23 12:27:19 2014 +0100 - - Add support for rospack_norecurse to avoid recursing into all subdirectories when looking for a package. - - I am installing ros into /usr, hence this searches in /usr/share. I have a lot of directories, not ROS related, into /usr/share (e.g. a full TeX Live install), and I get these timings: - - Without rospack_norecurse in /usr/share: - $ time rosversion rospack - 2.2.5 - - real 0m2.861s - user 0m1.588s - sys 0m1.267s - - With rospack_norecurse in /usr/share: - $ time rosversion rospack - 2.2.5 - - real 0m0.135s - user 0m0.100s - sys 0m0.034s - - This is on a desktop with a SSD drive. On an arm board, with much less packages in /usr/share but way much slower I/O I remember hitting the 10 seconds timeout for roscore to start. - -diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py -index e55acec..7ed98de 100644 ---- a/src/rospkg/rospack.py -+++ b/src/rospkg/rospack.py -@@ -42,7 +42,7 @@ from .stack import parse_stack_file, InvalidStack - _cache_lock = Lock() - - --def list_by_path(manifest_name, path, cache): -+def list_by_path(manifest_name, path, cache, recurse=True): - """ - List ROS stacks or packages within the specified path. - -@@ -53,6 +53,7 @@ def list_by_path(manifest_name, path, cache): - :param manifest_name: MANIFEST_FILE or STACK_FILE, ``str`` - :param path: path to list resources in, ``str`` - :param cache: path cache to update. Maps resource name to directory path, ``{str: str}`` -+ :param recurse: search recursively in subdirectories ``bool`` - :returns: complete list of resources in ROS environment, ``[str]`` - """ - resources = [] -@@ -89,9 +90,15 @@ def list_by_path(manifest_name, path, cache): - # optimization for stacks. - del dirs[:] - continue #leaf -- elif 'rospack_nosubdirs' in files: -+ elif 'rospack_nosubdirs' in files or not recurse: - del dirs[:] - continue #leaf -+ elif 'rospack_norecurse' in files: -+ for sd in dirs: -+ spath = os.path.join(d, sd) -+ resources += list_by_path(manifest_name, spath, cache, False) -+ del dirs[:] -+ continue - # remove hidden dirs (esp. .svn/.git) - [dirs.remove(di) for di in dirs if di[0] == '.'] - return resources diff --git a/dev-python/rospkg/rospkg-1.0.41.ebuild b/dev-python/rospkg/rospkg-1.0.41-r1.ebuild similarity index 82% rename from dev-python/rospkg/rospkg-1.0.41.ebuild rename to dev-python/rospkg/rospkg-1.0.41-r1.ebuild index 9939d92..666d51a 100644 --- a/dev-python/rospkg/rospkg-1.0.41.ebuild +++ b/dev-python/rospkg/rospkg-1.0.41-r1.ebuild @@ -39,18 +39,7 @@ DEPEND="${RDEPEND} dev-python/coverage[${PYTHON_USEDEP}] ) " -PATCHES=( - "${FILESDIR}/norecurse.patch" -) python_test() { nosetests --with-coverage --cover-package=rospkg --with-xunit test || die } - -src_install() { - distutils-r1_src_install - - # Avoid recursing into /usr/share when looking for packages. - dodir /usr/share - touch "${ED}/usr/share/rospack_norecurse" -} diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild index 5185441..666d51a 100644 --- a/dev-python/rospkg/rospkg-9999.ebuild +++ b/dev-python/rospkg/rospkg-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -39,18 +39,7 @@ DEPEND="${RDEPEND} dev-python/coverage[${PYTHON_USEDEP}] ) " -PATCHES=( - "${FILESDIR}/norecurse.patch" -) python_test() { nosetests --with-coverage --cover-package=rospkg --with-xunit test || die } - -src_install() { - distutils-r1_src_install - - # Avoid recursing into /usr/share when looking for packages. - dodir /usr/share - touch "${ED}/usr/share/rospack_norecurse" -}