summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-01 20:31:47 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-01 20:31:47 +0000
commit0f15e8c8097aed6ed34aa65b247b9ede28146574 (patch)
tree34ca121969e9b748d02dbe7c75be48ebc54d7603
parent0eae739fd34ff297b7468cfa8b729c213568c30f (diff)
downloadpuppet-0f15e8c8097aed6ed34aa65b247b9ede28146574.tar.gz
puppet-0f15e8c8097aed6ed34aa65b247b9ede28146574.tar.xz
puppet-0f15e8c8097aed6ed34aa65b247b9ede28146574.zip
fixing a bug that appeared somehow in port.rb, and adding mount and sshkey to the types being autoloaded
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1050 980ebf18-57e1-0310-9a29-db15c13687c0
-rwxr-xr-xlib/puppet/type/parsedtype.rb2
-rwxr-xr-xlib/puppet/type/parsedtype/port.rb3
-rwxr-xr-xtest/types/port.rb1
3 files changed, 6 insertions, 0 deletions
diff --git a/lib/puppet/type/parsedtype.rb b/lib/puppet/type/parsedtype.rb
index 386e94656..5fe8dcda6 100755
--- a/lib/puppet/type/parsedtype.rb
+++ b/lib/puppet/type/parsedtype.rb
@@ -328,5 +328,7 @@ end
require 'puppet/type/parsedtype/host'
require 'puppet/type/parsedtype/port'
+require 'puppet/type/parsedtype/mount'
+require 'puppet/type/parsedtype/sshkey'
# $Id$
diff --git a/lib/puppet/type/parsedtype/port.rb b/lib/puppet/type/parsedtype/port.rb
index feaa3afed..593455761 100755
--- a/lib/puppet/type/parsedtype/port.rb
+++ b/lib/puppet/type/parsedtype/port.rb
@@ -206,6 +206,9 @@ module Puppet
return false
end
+ # If this is happening, our object exists
+ self.is = [:ensure, :present]
+
if hash[:protocols]
# The protocol can be a symbol, so...
if proto.is_a?(Symbol)
diff --git a/test/types/port.rb b/test/types/port.rb
index 77da6c825..debd7ed89 100755
--- a/test/types/port.rb
+++ b/test/types/port.rb
@@ -182,6 +182,7 @@ class TestPort < Test::Unit::TestCase
port.delete(:alias)
assert(! port.state(:alias))
assert_events([:port_changed], port)
+
assert_nothing_raised {
port.retrieve
}