diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-29 18:08:15 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-29 18:08:15 +0000 |
| commit | 280f0b46618d201e6e2f89f938c8d6b66dc12eea (patch) | |
| tree | 927fb2ddbe9faf5cf0d1e00a113f4232de04cc81 /lib | |
| parent | 79e9b4650afce007525b501aef189cc37762b568 (diff) | |
| download | puppet-280f0b46618d201e6e2f89f938c8d6b66dc12eea.tar.gz puppet-280f0b46618d201e6e2f89f938c8d6b66dc12eea.tar.xz puppet-280f0b46618d201e6e2f89f938c8d6b66dc12eea.zip | |
Still trying to track down the tagging problem
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1994 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/parser/scope.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index 1f672d15b..12a3c3430 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -519,14 +519,14 @@ class Puppet::Parser::Scope # of the objects contained in this scope. def tag(*ary) ary.each { |tag| - unless tag =~ /^\w[-\w]+$/ - fail Puppet::ParseError, "Invalid tag %s" % tag.inspect - end if tag.nil? or tag == "" puts caller Puppet.debug "got told to tag with %s" % tag.inspect next end + unless tag =~ /^\w[-\w]+$/ + fail Puppet::ParseError, "Invalid tag %s" % tag.inspect + end tag = tag.to_s unless @tags.include?(tag) #Puppet.info "Tagging scope %s with %s" % [self.object_id, tag] |