summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-20 20:55:02 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-20 20:55:02 +0000
commit4a029d98a6d4c01e09fa4a302731ca5ec7a12fee (patch)
tree21e217643d6b99365de5b142e7eeac1c606009d5 /lib
parentd91b7df7befbd9e7877c97c2266b94864d55440f (diff)
downloadpuppet-4a029d98a6d4c01e09fa4a302731ca5ec7a12fee.tar.gz
puppet-4a029d98a6d4c01e09fa4a302731ca5ec7a12fee.tar.xz
puppet-4a029d98a6d4c01e09fa4a302731ca5ec7a12fee.zip
pelement listing now works
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1126 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rwxr-xr-xlib/puppet/server/pelement.rb17
-rwxr-xr-xlib/puppet/type/pfile/checksum.rb3
2 files changed, 17 insertions, 3 deletions
diff --git a/lib/puppet/server/pelement.rb b/lib/puppet/server/pelement.rb
index 660954942..7c4ee7fb3 100755
--- a/lib/puppet/server/pelement.rb
+++ b/lib/puppet/server/pelement.rb
@@ -76,7 +76,22 @@ class Server::PElementServer
end
end
- def list(type, name, client = nil, clientip = nil)
+ def list(type, ignore = [], base = nil, client = nil, clientip = nil)
+ @local = true unless client
+ typeklass = nil
+ unless typeklass = Puppet.type(type)
+ raise Puppet::Error, "Puppet type %s is unsupported" % type
+ end
+
+ bucket = TransBucket.new
+ bucket.type = typeklass.name
+
+ typeklass.list.each do |obj|
+ object = TransObject.new(obj.name, typeklass.name)
+ bucket << object
+ end
+
+ bucket
end
private
diff --git a/lib/puppet/type/pfile/checksum.rb b/lib/puppet/type/pfile/checksum.rb
index 54ab3d860..c00fd7f7f 100755
--- a/lib/puppet/type/pfile/checksum.rb
+++ b/lib/puppet/type/pfile/checksum.rb
@@ -288,8 +288,7 @@ module Puppet
#@parent.debug "@is: %s; @should: %s" % [@is,@should]
result = true
else
- @parent.debug "Creating checksum %s of type %s" %
- [@is,@checktypes[0]]
+ @parent.debug "Creating checksum %s" % @is
result = false
end
state[@checktypes[0]] = @is