Add hydro packages (turtlesim dependencies).

3 files changed, 7 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50e6db49791d..7b866681ec89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,7 +22,7 @@ pkgbase = ros-build-tools
 	md5sums = d257f7f20384e894b0431ee61068aa96
 	md5sums = 563c9d1320a3a997db25d3087303dcfb
 	md5sums = 8d6d7eb89a12c449497b209f1a06655b
-	md5sums = 00615fb2b1d27c906f25f37074902513
+	md5sums = d833e1600a1e3e794fbe9bcbe02e4bbe
 	md5sums = 07f5253eb3f8cb5295c32026a20ab6c0
 
 pkgname = ros-build-tools
diff --git a/PKGBUILD b/PKGBUILD
index 1dca10226516..9e8ed3c75ba9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -40,5 +40,5 @@ md5sums=('b2b4fd23abb8e9e7382ef9aeab2542f5'
          'd257f7f20384e894b0431ee61068aa96'
          '563c9d1320a3a997db25d3087303dcfb'
          '8d6d7eb89a12c449497b209f1a06655b'
-         '00615fb2b1d27c906f25f37074902513'
+         'd833e1600a1e3e794fbe9bcbe02e4bbe'
          '07f5253eb3f8cb5295c32026a20ab6c0')
diff --git a/import_catkin_packages.py b/import_catkin_packages.py
index ab96c1cb1495..94996ac2db2d 100755
--- a/import_catkin_packages.py
+++ b/import_catkin_packages.py
@@ -55,15 +55,17 @@ class PackageBase(object):
     #                                 just need to download and merge these files
     #                                 in a dictionary.
     dependency_map = self._get_rosdep_dictionary(rosdep_urls)
+    other_fixed_dependencies = set()
     #  - replace in other_dependencies
     for index, dep in enumerate(other_dependencies):
       if (dep in dependency_map):
         # The map may replace one package by multiple ones, or even by none
-        other_dependencies.remove(dep)
         for package in dependency_map[dep]:
-          other_dependencies.append(package)
+          other_fixed_dependencies.add(package)
+      else:
+        other_fixed_dependencies.add(dep)
 
-    return other_dependencies
+    return other_fixed_dependencies
 
   def _rosify_package_name(self, name):
     return name.replace('_', '-')