diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-09-23 01:12:26 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-09-23 01:12:26 +0000 |
| commit | 4c13c1053a9dcf14d9783bef288a7e98cda6fd9e (patch) | |
| tree | 167514ce266d81594c6e4419e46e87daaf667202 /lib/puppet.rb | |
| parent | 781c69b7d2c2a70b794d4fccb011c68e4d7a4950 (diff) | |
| download | puppet-4c13c1053a9dcf14d9783bef288a7e98cda6fd9e.tar.gz puppet-4c13c1053a9dcf14d9783bef288a7e98cda6fd9e.tar.xz puppet-4c13c1053a9dcf14d9783bef288a7e98cda6fd9e.zip | |
Nodes now support inheritance, for better or for worse.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@701 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet.rb')
| -rw-r--r-- | lib/puppet.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index 9d2f6d4c7..0679f477f 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -29,10 +29,10 @@ module Puppet def to_s str = nil - if defined? @file and defined? @line + if defined? @file and defined? @line and @file and @line str = "%s in file %s at line %s" % [@message, @file, @line] - elsif defined? @line + elsif defined? @line and @line str = "%s at line %s" % [@message, @line] else |