Ticket #703: collexpr.diff

File collexpr.diff, 1.6 kB (added by thijs, 1 year ago)
created with git diff

a/lib/puppet/parser/ast/collexpr.rb

old	new
54	54	if str1 == "title"
55	55	str = "title #{oper} '#{str2}'"
56	56	else
57		unless self.form == :virtual or str1 == "title"
58		parsefail "Collection from the database only supports " +
59		"title matching currently"
60		end
	57	# unless self.form == :virtual or str1 == "title"
	58	# parsefail "Collection from the database only supports " +
	59	# "title matching currently"
	60	# end
61	61	str = "rails_parameters.name = '#{str1}' and " +
62	62	"rails_parameters.value #{oper} '#{str2}'"
63	63	end
64	64	else
65	65	str = [str1, oper, str2].join(" ")
66	66	end
67
	67
68	68	return str, code
69	69	end
70	70

old	new
37	37	args
38	38	).each do \|obj\|
39	39	if resource = export_resource(obj)
40		count += 1
41		resources << resource
	40	if match?(resource)
	41	count += 1
	42	resources << resource
	43	end
42	44	end
43	45	end
44	46	end