diff options
| author | Benjamin Chrétien | 2014-01-19 01:58:51 +0100 |
|---|---|---|
| committer | Benjamin Chrétien | 2015-06-20 02:25:11 +0900 |
| commit | ef9be6bb80e80e3642ce0b3d862bf4d30a193943 (patch) | |
| tree | 564e68ec30175588d4b145dbb9b413abc9b6042d | |
| parent | d3d970129cc96b4085c1b68f728d9e6c1dbbf1f3 (diff) | |
| download | aur-ef9be6bb80e80e3642ce0b3d862bf4d30a193943.tar.gz | |
Fix roslib.
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rwxr-xr-x | import_catkin_packages.py | 10 |
3 files changed, 9 insertions, 5 deletions
@@ -22,7 +22,7 @@ pkgbase = ros-build-tools md5sums = d257f7f20384e894b0431ee61068aa96 md5sums = 563c9d1320a3a997db25d3087303dcfb md5sums = 8d6d7eb89a12c449497b209f1a06655b - md5sums = f0424039bb8112315a0b97e377619550 + md5sums = be9e97fe6305e676500e4b9605b525ed md5sums = 07f5253eb3f8cb5295c32026a20ab6c0 pkgname = ros-build-tools @@ -40,5 +40,5 @@ md5sums=('b2b4fd23abb8e9e7382ef9aeab2542f5' 'd257f7f20384e894b0431ee61068aa96' '563c9d1320a3a997db25d3087303dcfb' '8d6d7eb89a12c449497b209f1a06655b' - 'f0424039bb8112315a0b97e377619550' + 'be9e97fe6305e676500e4b9605b525ed' '07f5253eb3f8cb5295c32026a20ab6c0') diff --git a/import_catkin_packages.py b/import_catkin_packages.py index 6358080dc320..545cbb604b47 100755 --- a/import_catkin_packages.py +++ b/import_catkin_packages.py @@ -11,6 +11,7 @@ import urllib2 import urlparse import yaml import re +from collections import OrderedDict class PackageBase(object): @@ -24,8 +25,11 @@ class PackageBase(object): self.version = package.version self.version_patch = version_patch self.licenses = package.licenses - self.run_dependencies = [dependency.name for dependency in package.run_depends] - self.build_dependencies = [dependency.name for dependency in package.build_depends + package.buildtool_depends] + self.run_dependencies = list(OrderedDict.fromkeys([dependency.name for dependency in package.run_depends])) + self.build_dependencies = list(OrderedDict.fromkeys([dependency.name for dependency in package.build_depends + package.buildtool_depends])) + # Build dependencies already added: + if 'git' in self.build_dependencies: self.build_dependencies.remove('git') + if 'cmake' in self.build_dependencies: self.build_dependencies.remove('cmake') # Remove HTML tags from description self.description = re.sub('<[^<]+?>', '', package.description) @@ -454,7 +458,7 @@ def main(): help='The URLs of the rosdep mapping files.') parser.add_option( '--exclude-dependencies', metavar='exclude_dependencies', - default='python2-catkin-pkg,python2-rospkg,python2-rosdep', + default='', help='Comma-separated list of (source) package dependencies to exclude from the generated PKGBUILD file.') parser.add_option('-f', '--force', dest='force', action='store_true', default=False, help='Always overwrite exiting PKGBUILD files.') |