diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-28 19:14:11 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-28 19:14:11 +0000 |
| commit | d07570b78d6c6cc670b4e6c770fb409b64c5b24d (patch) | |
| tree | 117df623fb2bb01a0fdcdc2e77355ec9b90bb66f /lib/puppet/util.rb | |
| parent | 652982257d7d4b1fdfada25880d70b29702a4c69 (diff) | |
| download | puppet-d07570b78d6c6cc670b4e6c770fb409b64c5b24d.tar.gz puppet-d07570b78d6c6cc670b4e6c770fb409b64c5b24d.tar.xz puppet-d07570b78d6c6cc670b4e6c770fb409b64c5b24d.zip | |
Looks like providers work again on Solaris.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1980 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/util.rb')
| -rw-r--r-- | lib/puppet/util.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb index ef9f390f1..9e40251e2 100644 --- a/lib/puppet/util.rb +++ b/lib/puppet/util.rb @@ -269,7 +269,7 @@ module Util # Execute the desired command, and return the status and output. def execute(command, failonfail = true, uid = nil, gid = nil) if command.is_a?(Array) - command = command.collect { |i| i.to_s } + command = command.flatten.collect { |i| i.to_s } str = command.join(" ") else # We require an array here so we know where we're incorrectly @@ -278,9 +278,6 @@ module Util raise ArgumentError, "Must pass an array to execute()" end - if command[0].is_a?(Array) - raise ArgumentError, "Will not flatten arrays" - end if respond_to? :debug debug "Executing '%s'" % str else |