diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-06-02 23:38:55 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-06-02 23:38:55 +0000 |
| commit | a3ed62936c81951105fd5d7676858c8f9add3b38 (patch) | |
| tree | ecfd4a6bb1e03103352d69a1e919cb9045d7c94c /lib/puppet/util.rb | |
| parent | 81ce66a92a482aa1225fffa98fce4e874d2a83d0 (diff) | |
| download | puppet-a3ed62936c81951105fd5d7676858c8f9add3b38.tar.gz puppet-a3ed62936c81951105fd5d7676858c8f9add3b38.tar.xz puppet-a3ed62936c81951105fd5d7676858c8f9add3b38.zip | |
Intermediate commit; most of the core zone functions now work, and some of the configuration functions work.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1233 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/util.rb')
| -rw-r--r-- | lib/puppet/util.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb index 2f6136ef0..770bbc954 100644 --- a/lib/puppet/util.rb +++ b/lib/puppet/util.rb @@ -351,7 +351,12 @@ module Util # Execute the desired command, and return the status and output. def execute(command, failonfail = true) - output = %x{#{command}} + if respond_to? :debug + debug "Executing '%s'" % command + else + Puppet.debug "Executing '%s'" % command + end + output = %x{#{command} 2>&1} if failonfail unless $? == 0 |