Further progress towards the next release. Lots of small bugs fixed, the paths look much better now, and Transportable is much cleaner.

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

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
index 6e0854206..996a497d5 100644
--- a/lib/puppet/parser/scope.rb
+++ b/lib/puppet/parser/scope.rb
@@ -544,15 +544,13 @@ module Puppet
                     if tmp = self.objectdefined?(name, type)
                         msg = "Duplicate definition: %s[%s] is already defined" %
                             [type, name]
+                        error = Puppet::ParseError.new(msg)
                         if tmp.line
-                            msg += " at line %s" % tmp.line
+                            error.line = tmp.line
                         end
                         if tmp.file
-                            msg += " in file %s" % tmp.file
+                            error.file = tmp.file
                         end
-                        error = Puppet::ParseError.new(msg)
-                        error.file = file
-                        error.line = line
                         raise error
                     end