summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-10 19:01:47 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-10 19:01:47 +0000
commitd0eb56620a4e4f067b8f074393758b49d4ebccd6 (patch)
treedf7b604f24457740179c228173a379016dc4a103 /lib/puppet
parentee1eba23029ecbc29e75dc9646519bda49fa46b0 (diff)
downloadpuppet-d0eb56620a4e4f067b8f074393758b49d4ebccd6.tar.gz
puppet-d0eb56620a4e4f067b8f074393758b49d4ebccd6.tar.xz
puppet-d0eb56620a4e4f067b8f074393758b49d4ebccd6.zip
some small fixes
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@644 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/log.rb2
-rw-r--r--lib/puppet/type/pfile.rb1
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/log.rb b/lib/puppet/log.rb
index 5d7f867ab..02d82aae7 100644
--- a/lib/puppet/log.rb
+++ b/lib/puppet/log.rb
@@ -79,7 +79,7 @@ module Puppet
end
@@logdest = :syslog
elsif dest =~ /^\//
- if defined? @@logfile
+ if defined? @@logfile and @@logfile
@@logfile.close
end
diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index 074d86ab1..8bb393d93 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -830,7 +830,6 @@ module Puppet
:path,
:backup,
:linkmaker,
- :source,
:recurse
]