summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2014-03-12 13:42:23 +0100
committerBenjamin Chrétien2015-06-20 02:25:12 +0900
commit155fb24f7323fbeb73ca29c52715bdbc9f455901 (patch)
treee34b8a6057fcd937080d04b4ef41f202e07f00ac
parenta6a9c43088c00d5f23fd4d1f4068fc72bfec0c86 (diff)
downloadaur-155fb24f7323fbeb73ca29c52715bdbc9f455901.tar.gz
Add pacman specification for rosdep.
-rwxr-xr-ximport_catkin_packages.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/import_catkin_packages.py b/import_catkin_packages.py
index f2be13f80e8f..2f22510e19d5 100755
--- a/import_catkin_packages.py
+++ b/import_catkin_packages.py
@@ -127,7 +127,12 @@ class PackageBase(object):
rosdep_file = yaml.load(stream)
for package_name, distrib in rosdep_file.items():
if 'arch' in distrib:
- dependency_map[package_name] = distrib["arch"]
+ if 'pacman' in distrib["arch"]:
+ dependency_map[package_name] = distrib["arch"]["pacman"]["packages"]
+ elif 'aur' in distrib["arch"]:
+ dependency_map[package_name] = distrib["arch"]["aur"]["packages"]
+ else:
+ dependency_map[package_name] = distrib["arch"]
return dependency_map
def generate(self, exclude_dependencies=[]):
@@ -367,7 +372,11 @@ class DistroDescription(object):
def _get_package_data(self, name):
"""Searches for `name` in all known packages and metapackages."""
if self._distro['repositories'].get(name):
- return self._distro['repositories'][name]['release']
+ try:
+ return self._distro['repositories'][name]['release']
+ except KeyError, e:
+ print (colored("Missing %s branch for %s" % (e, name),
+ 'red', attrs=['bold']))
else:
for package in self.package_names():
if (self._is_meta_package(package)