| 1 |
commit: b74bbdb103793752fe430918e31a13825c58fc1b |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 11:04:00 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 11:26:51 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74bbdb1 |
| 7 |
|
| 8 |
dev-python/rospkg: strip ros_packages/ from path when updating the cache |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-python/rospkg/files/gentoo.patch | 15 +++++++++++++++ |
| 13 |
.../rospkg/{rospkg-9999.ebuild => rospkg-1.1.0-r1.ebuild} | 1 + |
| 14 |
dev-python/rospkg/rospkg-9999.ebuild | 1 + |
| 15 |
3 files changed, 17 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-python/rospkg/files/gentoo.patch b/dev-python/rospkg/files/gentoo.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000000..5a9e7738b3 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-python/rospkg/files/gentoo.patch |
| 22 |
@@ -0,0 +1,15 @@ |
| 23 |
+Strip ros_packages/ from paths. ros_packages is only for avoiding to crawl the |
| 24 |
+whole /usr but the real one in the path without it. |
| 25 |
+ |
| 26 |
+Index: rospkg-1.1.0/src/rospkg/rospack.py |
| 27 |
+=================================================================== |
| 28 |
+--- rospkg-1.1.0.orig/src/rospkg/rospack.py |
| 29 |
++++ rospkg-1.1.0/src/rospkg/rospack.py |
| 30 |
+@@ -59,6 +59,7 @@ def list_by_path(manifest_name, path, ca |
| 31 |
+ path = os.path.abspath(path) |
| 32 |
+ basename = os.path.basename |
| 33 |
+ for d, dirs, files in os.walk(path, topdown=True, followlinks=True): |
| 34 |
++ d = d.replace('ros_packages/', '') |
| 35 |
+ if 'CATKIN_IGNORE' in files: |
| 36 |
+ del dirs[:] |
| 37 |
+ continue # leaf |
| 38 |
|
| 39 |
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-1.1.0-r1.ebuild |
| 40 |
similarity index 96% |
| 41 |
copy from dev-python/rospkg/rospkg-9999.ebuild |
| 42 |
copy to dev-python/rospkg/rospkg-1.1.0-r1.ebuild |
| 43 |
index 56908705af..6ed953cac5 100644 |
| 44 |
--- a/dev-python/rospkg/rospkg-9999.ebuild |
| 45 |
+++ b/dev-python/rospkg/rospkg-1.1.0-r1.ebuild |
| 46 |
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND} |
| 47 |
dev-python/coverage[${PYTHON_USEDEP}] |
| 48 |
) |
| 49 |
" |
| 50 |
+PATCHES=( "${FILESDIR}/gentoo.patch" ) |
| 51 |
|
| 52 |
python_test() { |
| 53 |
nosetests --with-coverage --cover-package=rospkg --with-xunit test || die |
| 54 |
|
| 55 |
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild |
| 56 |
index 56908705af..6ed953cac5 100644 |
| 57 |
--- a/dev-python/rospkg/rospkg-9999.ebuild |
| 58 |
+++ b/dev-python/rospkg/rospkg-9999.ebuild |
| 59 |
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND} |
| 60 |
dev-python/coverage[${PYTHON_USEDEP}] |
| 61 |
) |
| 62 |
" |
| 63 |
+PATCHES=( "${FILESDIR}/gentoo.patch" ) |
| 64 |
|
| 65 |
python_test() { |
| 66 |
nosetests --with-coverage --cover-package=rospkg --with-xunit test || die |
Archives