update gazebo and ros2 regexes accordingly

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
osrf · Jul 17, 2019 · 98b15d8 · 98b15d8
1 parent 6f5f497
commit 98b15d8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/docker_templates/packages.py b/docker_templates/packages.py
@@ -21,9 +21,9 @@
 version_pattern = r'(?<=Version: )\d+\.\d+\.\d+\-\d+'
 
 packagePatternTemplateLookup = {
-    'gazebo_packages':  string.Template(r'(\bPackage: gazebo$gazebo_version\n)(.*\n)'),
+    'gazebo_packages':  string.Template(r'(\bPackage: gazebo$gazebo_version\n)(.*?(?:\r*\n{2}))'),
     'ros_packages':     string.Template(r'(\bPackage: ros-$rosdistro_name-$package\n)(.*?(?:\r*\n{2}))'),
-    'ros2_packages':    string.Template(r'(\bPackage: ros-$ros2distro_name-$package\n)(.*\n)'),
+    'ros2_packages':    string.Template(r'(\bPackage: ros-$ros2distro_name-$package\n)(.*?(?:\r*\n{2}))'),
 }
 
 indexUrlTemplateLookup = {