summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-02-25 00:28:19 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-02-25 00:28:19 +0000
commit63afa37f6730a18a6d0fb8998f09e40ca9ff1e40 (patch)
treea328e283fae5eb226a2a8e5af4748f38fc1e2dc9
parent505605434d75617cb4c15694150990b9b3a3cc72 (diff)
downloadpuppet-63afa37f6730a18a6d0fb8998f09e40ca9ff1e40.tar.gz
puppet-63afa37f6730a18a6d0fb8998f09e40ca9ff1e40.tar.xz
puppet-63afa37f6730a18a6d0fb8998f09e40ca9ff1e40.zip
Fixing nodes so that their paths are printed correctly
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@948 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r--lib/puppet/transportable.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/transportable.rb b/lib/puppet/transportable.rb
index 1cbf2f3ba..1eeef6988 100644
--- a/lib/puppet/transportable.rb
+++ b/lib/puppet/transportable.rb
@@ -168,8 +168,9 @@ module Puppet
if usetrans
name = nil
- #if self.autoname or @name =~ /-\d+$/
- if self.autoname
+
+ # Nodes have the same name and type
+ if self.autoname or @name == @type
name = @type
else
name = "%s[%s]" % [@type, @name]