Fix failure of test_importglobbing in test/parser/parser.rb

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@925 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 11 insertions, 1 deletions

diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 6ed4fd4d5..13a3729c6 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -454,7 +454,17 @@ import: IMPORT quotedtext {
         :line => @lexer.line
     )
     Dir.chdir(dir) {
-        Dir.glob(val[1]).each { |file|
+        # We can't interpolate at this point since we don't have any 
+        # scopes set up. Warn the user if they use a variable reference
+        pat = val[1].value
+        if pat.index("$")
+             Puppet.warning(
+                 "The import of #{pat} contains a variable reference;" +
+                 " variables are not interpolated for imports " +
+                 "in file #{@lexer.file} at line #{@lexer.line}"
+             )
+        end         
+        Dir.glob(pat).each { |file|
             parser = Puppet::Parser::Parser.new()
             parser.files = self.files
             Puppet.debug("importing '%s'" % file)