diff options
| author | cthorn42 <christopher.thorn@puppet.com> | 2023-11-27 14:33:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-27 14:33:43 -0800 |
| commit | 05eb6f54809b5e6102d33fb5747690d32ee082a4 (patch) | |
| tree | 60eaae0ad250b7e6efd7329873be74dd77813649 /lib/puppet | |
| parent | 8990735b40f5aa0e95b444aaff8af08feab35968 (diff) | |
| parent | be5ae9bc9e198a00f2a790992b663dda374006ba (diff) | |
| download | puppet-cron_core-05eb6f54809b5e6102d33fb5747690d32ee082a4.tar.gz puppet-cron_core-05eb6f54809b5e6102d33fb5747690d32ee082a4.tar.bz2 | |
Merge pull request #62 from joshcooper/stringify_process_output
Convert ProcessOutput to String explicitly
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/provider/cron/filetype.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/puppet/provider/cron/filetype.rb b/lib/puppet/provider/cron/filetype.rb index 455ec07..3badeff 100644 --- a/lib/puppet/provider/cron/filetype.rb +++ b/lib/puppet/provider/cron/filetype.rb @@ -50,7 +50,7 @@ class Puppet::Provider::Cron return '' end - Puppet::Util::Execution.execute("#{cmdbase} -l", failonfail: true, combine: true) + Puppet::Util::Execution.execute("#{cmdbase} -l", failonfail: true, combine: true).to_s rescue => detail case detail.to_s when %r{no crontab for} @@ -71,7 +71,7 @@ class Puppet::Provider::Cron cmd = "/bin/echo yes | #{cmd}" end - Puppet::Util::Execution.execute(cmd, failonfail: true, combine: true) + Puppet::Util::Execution.execute(cmd, failonfail: true, combine: true).to_s end # Overwrite a specific @path's cron tab; must be passed the @path name @@ -113,7 +113,7 @@ class Puppet::Provider::Cron return '' end - Puppet::Util::Execution.execute(['crontab', '-l'], cronargs) + Puppet::Util::Execution.execute(['crontab', '-l'], cronargs).to_s rescue => detail case detail.to_s when %r{can't open your crontab} @@ -129,7 +129,7 @@ class Puppet::Provider::Cron # Remove a specific @path's cron tab. def remove - Puppet::Util::Execution.execute(['crontab', '-r'], cronargs) + Puppet::Util::Execution.execute(['crontab', '-r'], cronargs).to_s rescue => detail raise FileReadError, _('Could not remove crontab for %{path}: %{detail}') % { path: @path, detail: detail }, detail.backtrace end @@ -144,7 +144,7 @@ class Puppet::Provider::Cron output_file.close # We have to chown the stupid file to the user. File.chown(Puppet::Util.uid(@path), nil, output_file.path) - Puppet::Util::Execution.execute(['crontab', output_file.path], cronargs) + Puppet::Util::Execution.execute(['crontab', output_file.path], cronargs).to_s rescue => detail raise FileReadError, _('Could not write crontab for %{path}: %{detail}') % { path: @path, detail: detail }, detail.backtrace ensure @@ -164,7 +164,7 @@ class Puppet::Provider::Cron return '' end - Puppet::Util::Execution.execute(['crontab', '-l'], cronargs) + Puppet::Util::Execution.execute(['crontab', '-l'], cronargs).to_s rescue => detail case detail.to_s when %r{open.*in.*directory} @@ -180,7 +180,7 @@ class Puppet::Provider::Cron # Remove a specific @path's cron tab. def remove - Puppet::Util::Execution.execute(['crontab', '-r'], cronargs) + Puppet::Util::Execution.execute(['crontab', '-r'], cronargs).to_s rescue => detail raise FileReadError, _('Could not remove crontab for %{path}: %{detail}') % { path: @path, detail: detail }, detail.backtrace end @@ -196,7 +196,7 @@ class Puppet::Provider::Cron output_file.close # We have to chown the stupid file to the user. File.chown(Puppet::Util.uid(@path), nil, output_file.path) - Puppet::Util::Execution.execute(['crontab', output_file.path], cronargs) + Puppet::Util::Execution.execute(['crontab', output_file.path], cronargs).to_s rescue => detail raise FileReadError, _('Could not write crontab for %{path}: %{detail}') % { path: @path, detail: detail }, detail.backtrace ensure |