summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/parser/functions')
-rw-r--r--lib/puppet/parser/functions/sort.rb2
-rw-r--r--lib/puppet/parser/functions/values_at.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/functions/sort.rb b/lib/puppet/parser/functions/sort.rb
index 3785496..cefbe54 100644
--- a/lib/puppet/parser/functions/sort.rb
+++ b/lib/puppet/parser/functions/sort.rb
@@ -18,7 +18,7 @@ Sorts strings and arrays lexically.
if value.is_a?(Array) then
value.sort
elsif value.is_a?(String) then
- value.split("").sort.to_s
+ value.split("").sort.join("")
end
end
diff --git a/lib/puppet/parser/functions/values_at.rb b/lib/puppet/parser/functions/values_at.rb
index 7f1de8e..d3e69d9 100644
--- a/lib/puppet/parser/functions/values_at.rb
+++ b/lib/puppet/parser/functions/values_at.rb
@@ -38,7 +38,7 @@ Would return ['a','c','d'].
raise(Puppet::ParseError, 'values_at(): Requires array to work with')
end
- indices = *arguments # Get them all ... Pokemon ...
+ indices = [arguments.shift].flatten() # Get them all ... Pokemon ...
if not indices or indices.empty?
raise(Puppet::ParseError, 'values_at(): You must provide ' +