summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
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
]