remove hardcoded ubuntu and cleanup snapshot url construction logic

Signed-off-by: Mikael Arguedas <[email protected]>
osrf · Jul 27, 2019 · 49cc868 · 49cc868
1 parent c99dd84
commit 49cc868
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/docker_templates/templates/snippet/setup_ros_sources.Dockerfile.em b/docker_templates/templates/snippet/setup_ros_sources.Dockerfile.em
@@ -1,12 +1,19 @@
 @{
+import os
+
 from docker_templates.eol_distro import isDistroEOL
 if int(ros_version) == 2:
     ros_distro_name = ros2distro_name
 elif int(ros_version) == 1:
     ros_distro_name = rosdistro_name
 
 if isDistroEOL(ros_distro_name, os_code_name):
-    repo_url = 'http://snapshots.ros.org/' + str(ros_distro_name) + '/final/' + 'ubuntu' + '/'
+    repo_url = os.path.join(
+        'http://snapshots.ros.org',
+        str(ros_distro_name),
+        'final',
+        str(os_name)
+    )
     repo_key = 'AD19BAB3CBF125EA'
     source_suffix = 'snapshots'
 else: