summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-15 15:27:49 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-15 15:27:49 +0000
commite841d8fafac51837b13c3f429d988944aaba2119 (patch)
treef9b6f43c49ea33fdbf85bf1d52eafe79e29fc5a3 /lib
parent6ef3d88110fd44b51733d03ff01f5f84aa327fb7 (diff)
downloadpuppet-e841d8fafac51837b13c3f429d988944aaba2119.tar.gz
puppet-e841d8fafac51837b13c3f429d988944aaba2119.tar.xz
puppet-e841d8fafac51837b13c3f429d988944aaba2119.zip
Adding test and fix for empty execs being ignored
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1288 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/parser/scope.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
index b5f91a4f9..b607bb081 100644
--- a/lib/puppet/parser/scope.rb
+++ b/lib/puppet/parser/scope.rb
@@ -999,9 +999,11 @@ module Puppet::Parser
child.class
end
- # Skip empty builtin types or defined types
- if result and ! result.empty?
- results << result
+ # Skip nil objects or empty transbuckets
+ if result
+ unless result.is_a? Puppet::TransBucket and result.empty?
+ results << result
+ end
end
end