diff options
| author | Benjamin Chrétien | 2014-02-01 13:03:02 +0100 |
|---|---|---|
| committer | Benjamin Chrétien | 2015-06-20 02:25:12 +0900 |
| commit | 021bb2ac533c53ee0672205e31ba048bbd70a09d (patch) | |
| tree | 2c8c22854605fab204051ab93fefab5e6f72e847 | |
| parent | bc9fdf9588d5bc36f1248306048305a174f58e18 (diff) | |
| download | aur-021bb2ac533c53ee0672205e31ba048bbd70a09d.tar.gz | |
Update import_catkin_packages.py with latest rosdistro changes.
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rwxr-xr-x | import_catkin_packages.py | 6 |
3 files changed, 5 insertions, 5 deletions
@@ -22,7 +22,7 @@ pkgbase = ros-build-tools md5sums = d257f7f20384e894b0431ee61068aa96 md5sums = 563c9d1320a3a997db25d3087303dcfb md5sums = 8d6d7eb89a12c449497b209f1a06655b - md5sums = be9e97fe6305e676500e4b9605b525ed + md5sums = c1d8107916d2339ab174fab5e9f0c35c md5sums = 07f5253eb3f8cb5295c32026a20ab6c0 pkgname = ros-build-tools @@ -40,5 +40,5 @@ md5sums=('8b2e864de97e97298ebfb8da471f2df1' 'd257f7f20384e894b0431ee61068aa96' '563c9d1320a3a997db25d3087303dcfb' '8d6d7eb89a12c449497b209f1a06655b' - 'be9e97fe6305e676500e4b9605b525ed' + 'c1d8107916d2339ab174fab5e9f0c35c' '07f5253eb3f8cb5295c32026a20ab6c0') diff --git a/import_catkin_packages.py b/import_catkin_packages.py index 545cbb604b47..21d5fff31876 100755 --- a/import_catkin_packages.py +++ b/import_catkin_packages.py @@ -297,7 +297,7 @@ class DistroDescription(object): 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'] + metapackages = self._distro['repositories']['metapackages']['release'] for meta in metapackages['packages']: self._distro['repositories'][meta] = {} self._distro['repositories'][meta]['url'] = metapackages['url'] @@ -318,7 +318,7 @@ class DistroDescription(object): return self._get_package_data(name) != None def package(self, name): - package_data = self._get_package_data(name) + package_data = self._get_package_data(name)['release'] if not package_data: raise Exception('Unable to find package `%s`' % name) if self._package_cache.get(name): @@ -447,7 +447,7 @@ def main(): default=False, help='Lists all available packages.') parser.add_option('--output-directory', metavar='output_directory', default='.', help='The output directory. Packages are put into <output-directory>/<name>') - default_distro_url = 'https://raw.github.com/ros/rosdistro/master/%s/release.yaml' + default_distro_url = 'https://raw.github.com/ros/rosdistro/master/%s/distribution.yaml' parser.add_option( '--distro-url', metavar='distro_url', default=default_distro_url, help='The URL of the distro description. %s is replaced by the actual distro name') |