consider multiple distribution files with rep 143

ros-infrastructure · Dec 2, 2014 · 4f2e28a · 4f2e28a
1 parent 8a40c3e
commit 4f2e28a
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/bloom/commands/release.py b/bloom/commands/release.py
@@ -210,7 +210,15 @@ def get_index():
 def get_distribution_file(distro):
     global _rosdistro_distribution_files
     if distro not in _rosdistro_distribution_files:
-        _rosdistro_distribution_files[distro] = rosdistro.get_distribution_file(get_index(), distro)
+        try:
+            # REP 143, get list of distribution files and take the last one
+            files = rosdistro.get_distribution_files(get_index(), distro)
+            if not files:
+                error("No distribution files listed for distribution '{0}'."
+                      .format(distro), exit=True)
+            _rosdistro_distribution_files[distro] = files[-1]
+        except AttributeError:
+            _rosdistro_distribution_files[distro] = rosdistro.get_distribution_file(get_index(), distro)
     return _rosdistro_distribution_files[distro]
 
 _rosdistro_distribution_file_urls = {}