lib/bauxite/actions/tryload.rb in bauxite-0.6.7 vs lib/bauxite/actions/tryload.rb in bauxite-0.6.8

@@ -63,19 +63,9 @@
 			h[data[0]] = data[1]
 			h
 		end
 		
 		lambda do
-			ret_vars = nil
-			@ctx.with_vars var_hash do
-				yield file
-				rets = @ctx.variables['__RETURN__']
-				if rets == ['*']
-					ret_vars = @ctx.variables
-				elsif rets != nil 
-					ret_vars = @ctx.variables.select { |k,v| rets.include? k }
-				end
-			end
-			@ctx.variables.merge!(ret_vars) if ret_vars
+			@ctx.with_vars(var_hash) { yield file }
 		end
 	end
 end