diff options
| author | Luke Kanies <luke@madstop.com> | 2008-07-04 22:14:37 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-07-04 22:14:37 -0500 |
| commit | b0febd263c0cb8e61d512898f7c79868ea77e619 (patch) | |
| tree | 3f35c4b2d7186d3c69c070c9edc684ccdc51f658 /lib/puppet/node | |
| parent | df528a66cafc8538c3208bf0b52fdbe1065f6e48 (diff) | |
| parent | 81be1c5c3f85f514505e99fab5b8a2b2ae6fbec8 (diff) | |
| download | puppet-b0febd263c0cb8e61d512898f7c79868ea77e619.tar.gz puppet-b0febd263c0cb8e61d512898f7c79868ea77e619.tar.xz puppet-b0febd263c0cb8e61d512898f7c79868ea77e619.zip | |
Merge branch '0.24.x'
Conflicts:
lib/puppet/util/settings.rb
spec/integration/defaults.rb
spec/unit/node/catalog.rb
spec/unit/type/interface.rb
spec/unit/type/ssh_authorized_key.rb
Diffstat (limited to 'lib/puppet/node')
| -rw-r--r-- | lib/puppet/node/catalog.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb index 9dbdb8d62..852904967 100644 --- a/lib/puppet/node/catalog.rb +++ b/lib/puppet/node/catalog.rb @@ -95,6 +95,7 @@ class Puppet::Node::Catalog < Puppet::PGraph # isn't sufficient. return if newref == resource.ref if existing = @resource_table[newref] + return if existing == resource raise(ArgumentError, "Cannot alias %s to %s; resource %s already exists" % [resource.ref, name, newref]) end @resource_table[newref] = resource |