diff options
| author | Luke Kanies <luke@madstop.com> | 2008-07-02 21:16:45 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-07-02 21:16:45 -0500 |
| commit | daf0d9db5dc400a9795a5f741c8c63184f5e8982 (patch) | |
| tree | 80a2699e228beaaa9673355a5ff892947559d874 /lib | |
| parent | d56deb378704dbb07ae616df011a2ed7cb375920 (diff) | |
| download | puppet-daf0d9db5dc400a9795a5f741c8c63184f5e8982.tar.gz puppet-daf0d9db5dc400a9795a5f741c8c63184f5e8982.tar.xz puppet-daf0d9db5dc400a9795a5f741c8c63184f5e8982.zip | |
Backporting a test that was failing in master, and fixing it
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib')
| -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 720b3752d..17927388a 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 |