From 280f0b46618d201e6e2f89f938c8d6b66dc12eea Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Fri, 29 Dec 2006 18:08:15 +0000
Subject: Still trying to track down the tagging problem

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1994 980ebf18-57e1-0310-9a29-db15c13687c0
---
 lib/puppet/parser/scope.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/puppet/parser')

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]
-- 
cgit