lib/autoproj/ros_package_manifest.rb in autoproj-2.16.0 vs lib/autoproj/ros_package_manifest.rb in autoproj-2.17.0

@@ -21,13 +21,16 @@
             SUPPORTED_MODES = %w[test doc].freeze
             DEPEND_TAGS = %w[depend build_depend build_export_depend
                              buildtool_depend buildtool_export_depend
                              exec_depend test_depend run_depend doc_depend].to_set.freeze
 
-            def initialize(path, manifest)
+            def initialize(path, manifest, condition_context: {})
                 super
-                @env = manifest.package.ws.env
-                @condition_parser = RosConditionParser.new(@env)
+                @condition_parser = RosConditionParser.new do |var|
+                    Autoproj.expand(var, condition_context)
+                rescue StandardError
+                    ""
+                end
             end
 
             def tag_start(name, attributes)
                 super
                 exportlevel_tag_start(name, attributes) if @export_level