summaryrefslogtreecommitdiffstats
path: root/lib/puppet/node/environment.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2011-03-25 16:25:09 -0700
committerJesse Wolfe <jes5199@gmail.com>2011-03-25 16:25:09 -0700
commit6985cc0f898d71dbd2ffbb353a2a482d9783cb42 (patch)
tree04aa795343486b7bb384836d2550dc9a6312ebe2 /lib/puppet/node/environment.rb
parentcc53969290512b15819fbd72021f342fee2f28f5 (diff)
parentdaaa048a8d8829ad509b4a456826cc8a33cf6444 (diff)
downloadpuppet-6985cc0f898d71dbd2ffbb353a2a482d9783cb42.tar.gz
puppet-6985cc0f898d71dbd2ffbb353a2a482d9783cb42.tar.xz
puppet-6985cc0f898d71dbd2ffbb353a2a482d9783cb42.zip
Merge branch 'ticket/next/5477' into next
Diffstat (limited to 'lib/puppet/node/environment.rb')
-rw-r--r--lib/puppet/node/environment.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb
index 7877b7f73..d50530618 100644
--- a/lib/puppet/node/environment.rb
+++ b/lib/puppet/node/environment.rb
@@ -76,7 +76,7 @@ class Puppet::Node::Environment
# per environment semantics with an efficient most common cases; we almost
# always just return our thread's known-resource types. Only at the start
# of a compilation (after our thread var has been set to nil) or when the
- # environment has changed do we delve deeper.
+ # environment has changed do we delve deeper.
Thread.current[:known_resource_types] = nil if (krt = Thread.current[:known_resource_types]) && krt.environment != self
Thread.current[:known_resource_types] ||= synchronize {
if @known_resource_types.nil? or @known_resource_types.stale?
@@ -128,7 +128,7 @@ class Puppet::Node::Environment
to_s.to_sym
end
- # The only thing we care about when serializing an environment is its
+ # The only thing we care about when serializing an environment is its
# identity; everything else is ephemeral and should not be stored or
# transmitted.
def to_zaml(z)
@@ -156,7 +156,6 @@ class Puppet::Node::Environment
parser.string = code
else
file = Puppet.settings.value(:manifest, name.to_s)
- return empty_parse_result unless File.exist?(file)
parser.file = file
end
parser.parse