summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2014-01-18 21:56:34 +0100
committerBenjamin Chrétien2015-06-20 02:25:11 +0900
commit092b8f607a6221502093b38487bcfbe200950811 (patch)
tree4f03d044b7778f7ebcd66e7e20cef1642bc10e4f
parent29dd2e7eeedc996f6eee158257bd3113c267402e (diff)
downloadaur-092b8f607a6221502093b38487bcfbe200950811.tar.gz
Add ROS metapackages/variants.
See: http://www.ros.org/reps/rep-0131.html#variants
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rwxr-xr-ximport_catkin_packages.py9
3 files changed, 11 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 96c97f4d9cf2..02aef644ec06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,7 +22,7 @@ pkgbase = ros-build-tools
md5sums = d257f7f20384e894b0431ee61068aa96
md5sums = 563c9d1320a3a997db25d3087303dcfb
md5sums = 8d6d7eb89a12c449497b209f1a06655b
- md5sums = da381d4f57e1563ac67703de4c675e86
+ md5sums = 5b97e0f6f5aea290ec54be37fbd15093
md5sums = 07f5253eb3f8cb5295c32026a20ab6c0
pkgname = ros-build-tools
diff --git a/PKGBUILD b/PKGBUILD
index c776b0b79f34..c9d5a3e8e88e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -40,5 +40,5 @@ md5sums=('b2b4fd23abb8e9e7382ef9aeab2542f5'
'd257f7f20384e894b0431ee61068aa96'
'563c9d1320a3a997db25d3087303dcfb'
'8d6d7eb89a12c449497b209f1a06655b'
- 'da381d4f57e1563ac67703de4c675e86'
+ '5b97e0f6f5aea290ec54be37fbd15093'
'07f5253eb3f8cb5295c32026a20ab6c0')
diff --git a/import_catkin_packages.py b/import_catkin_packages.py
index 567ec2e74ea5..3a8fed98d7f4 100755
--- a/import_catkin_packages.py
+++ b/import_catkin_packages.py
@@ -249,6 +249,15 @@ class DistroDescription(object):
if self.name == "fuerte":
if self.name != self._distro['release-name']:
raise Exception('ROS distro names do not match (%s != %s)' % (self.name, self._distro['release-name']))
+ # process "metapackages"
+ if 'metapackages' in self._distro['repositories'].keys():
+ metapackages = self._distro['repositories']['metapackages']
+ for meta in metapackages['packages']:
+ self._distro['repositories'][meta] = {}
+ self._distro['repositories'][meta]['url'] = metapackages['url']
+ self._distro['repositories'][meta]['version'] = metapackages['version']
+ del self._distro['repositories']['metapackages']
+
def package_names(self, expand_metapackages=False):
packages = [name for name in self._distro['repositories'].keys()]