diff options
| author | Luke Kanies <luke@madstop.com> | 2008-01-09 13:03:15 -0800 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-01-09 13:03:15 -0800 |
| commit | 5bef4a55b3489a6404ee34b900621af8b784749a (patch) | |
| tree | 82a03e2434597160c8a52125f2c6fd948a942291 /lib/puppet/network/handler | |
| parent | 3cc3e0f5b21deee4fbdbcbae18fba47c7a0cbb1e (diff) | |
| download | puppet-5bef4a55b3489a6404ee34b900621af8b784749a.tar.gz puppet-5bef4a55b3489a6404ee34b900621af8b784749a.tar.xz puppet-5bef4a55b3489a6404ee34b900621af8b784749a.zip | |
Another round of fixes toward making global resources work.
The only remaining failures are more complicated ones (which I'll
need to not be on a plane to debug, for battery reasons) or those
related to the broken directory_service providers.
Diffstat (limited to 'lib/puppet/network/handler')
| -rwxr-xr-x | lib/puppet/network/handler/resource.rb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/puppet/network/handler/resource.rb b/lib/puppet/network/handler/resource.rb index f2a339751..7ec27b4dc 100755 --- a/lib/puppet/network/handler/resource.rb +++ b/lib/puppet/network/handler/resource.rb @@ -68,15 +68,11 @@ class Puppet::Network::Handler retrieve ||= :all ignore ||= [] - if obj = typeklass[name] - obj[:check] = retrieve - else - begin - obj = typeklass.create(:name => name, :check => retrieve) - rescue Puppet::Error => detail - raise Puppet::Error, "%s[%s] could not be created: %s" % - [type, name, detail] - end + begin + obj = typeklass.create(:name => name, :check => retrieve) + rescue Puppet::Error => detail + raise Puppet::Error, "%s[%s] could not be created: %s" % + [type, name, detail] end unless obj |