commit: b74bbdb103793752fe430918e31a13825c58fc1b
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 11:04:00 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 11:26:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74bbdb1
dev-python/rospkg: strip ros_packages/ from path when updating the cache
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-python/rospkg/files/gentoo.patch | 15 +++++++++++++++
.../rospkg/{rospkg-9999.ebuild => rospkg-1.1.0-r1.ebuild} | 1 +
dev-python/rospkg/rospkg-9999.ebuild | 1 +
3 files changed, 17 insertions(+)
diff --git a/dev-python/rospkg/files/gentoo.patch
b/dev-python/rospkg/files/gentoo.patch
new file mode 100644
index 0000000000..5a9e7738b3
--- /dev/null
+++ b/dev-python/rospkg/files/gentoo.patch
@@ -0,0 +1,15 @@
+Strip ros_packages/ from paths. ros_packages is only for avoiding to crawl the
+whole /usr but the real one in the path without it.
+
+Index: rospkg-1.1.0/src/rospkg/rospack.py
+===================================================================
+--- rospkg-1.1.0.orig/src/rospkg/rospack.py
++++ rospkg-1.1.0/src/rospkg/rospack.py
+@@ -59,6 +59,7 @@ def list_by_path(manifest_name, path, ca
+ path = os.path.abspath(path)
+ basename = os.path.basename
+ for d, dirs, files in os.walk(path, topdown=True, followlinks=True):
++ d = d.replace('ros_packages/', '')
+ if 'CATKIN_IGNORE' in files:
+ del dirs[:]
+ continue # leaf
diff --git a/dev-python/rospkg/rospkg-9999.ebuild
b/dev-python/rospkg/rospkg-1.1.0-r1.ebuild
similarity index 96%
copy from dev-python/rospkg/rospkg-9999.ebuild
copy to dev-python/rospkg/rospkg-1.1.0-r1.ebuild
index 56908705af..6ed953cac5 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.0-r1.ebuild
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
dev-python/coverage[${PYTHON_USEDEP}]
)
"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
python_test() {
nosetests --with-coverage --cover-package=rospkg --with-xunit test ||
die
diff --git a/dev-python/rospkg/rospkg-9999.ebuild
b/dev-python/rospkg/rospkg-9999.ebuild
index 56908705af..6ed953cac5 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
dev-python/coverage[${PYTHON_USEDEP}]
)
"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
python_test() {
nosetests --with-coverage --cover-package=rospkg --with-xunit test ||
die
