diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-10-23 01:38:03 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-10-23 01:38:03 +0000 |
| commit | 1b74e8e493abe1951f1e535e752521326a63c6d3 (patch) | |
| tree | ee1b90bf5208985654cf1905a1845d470652a6ed /lib/puppet/parser | |
| parent | 32d89bac8b8c8d94aac17301b2bfb16e10d8564f (diff) | |
| download | puppet-1b74e8e493abe1951f1e535e752521326a63c6d3.tar.gz puppet-1b74e8e493abe1951f1e535e752521326a63c6d3.tar.xz puppet-1b74e8e493abe1951f1e535e752521326a63c6d3.zip | |
The Puppet::Util.asuser function now works; had to slightly modify user.rb to make checking work. In addition, exec.rb now takes advantage of it. I also decided to make a small change to type.rb -- validstates now only returns state names, not names and states.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@726 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/scope.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index 73c2e8f96..66779cc0f 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -555,7 +555,7 @@ module Puppet # just our parents' tags, plus our type. def tags tmp = [] + @tags - unless @type.nil? or @type == "" + unless ! defined? @type or @type.nil? or @type == "" tmp << @type.to_s end if @parent |