Signed-off-by: Nigel Kersten <[email protected]>
---
lib/puppet/provider/package/appdmg.rb | 3 ++-
lib/puppet/provider/package/apple.rb | 4 +---
lib/puppet/provider/package/darwinport.rb | 2 +-
lib/puppet/provider/package/pkgdmg.rb | 5 +++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/puppet/provider/package/appdmg.rb
b/lib/puppet/provider/package/appdmg.rb
index 5d64eff..352f873 100644
--- a/lib/puppet/provider/package/appdmg.rb
+++ b/lib/puppet/provider/package/appdmg.rb
@@ -16,7 +16,8 @@ require 'puppet/provider/package'
Puppet::Type.type(:package).provide(:appdmg, :parent =>
Puppet::Provider::Package) do
desc "Package management which copies application bundles to a target."
- confine :exists => "/Library/Receipts"
+ confine :operatingsystem => :darwin
+
commands :hdiutil => "/usr/bin/hdiutil"
commands :curl => "/usr/bin/curl"
commands :ditto => "/usr/bin/ditto"
diff --git a/lib/puppet/provider/package/apple.rb
b/lib/puppet/provider/package/apple.rb
index b211b7e..063470f 100755
--- a/lib/puppet/provider/package/apple.rb
+++ b/lib/puppet/provider/package/apple.rb
@@ -8,11 +8,9 @@ Puppet::Type.type(:package).provide :apple, :parent =>
Puppet::Provider::Package
automatically add the ``.pkg`` extension, so leave that off when
specifying
the package name."
- confine :exists => "/Library/Receipts"
+ confine :operatingsystem => :darwin
commands :installer => "/usr/sbin/installer"
- defaultfor :operatingsystem => :darwin
-
def self.instances
instance_by_name.collect do |name|
self.new(
diff --git a/lib/puppet/provider/package/darwinport.rb
b/lib/puppet/provider/package/darwinport.rb
index 73d5f39..7829438 100755
--- a/lib/puppet/provider/package/darwinport.rb
+++ b/lib/puppet/provider/package/darwinport.rb
@@ -3,8 +3,8 @@ require 'puppet/provider/package'
Puppet::Type.type(:package).provide :darwinport, :parent =>
Puppet::Provider::Package do
desc "Package management using DarwinPorts on OS X."
+ confine :operatingsystem => :darwin
commands :port => "/opt/local/bin/port"
- confine :operatingsystem => "Darwin"
def self.eachpkgashash
# list out all of the packages
diff --git a/lib/puppet/provider/package/pkgdmg.rb
b/lib/puppet/provider/package/pkgdmg.rb
index 8f11a0a..8a916d5 100644
--- a/lib/puppet/provider/package/pkgdmg.rb
+++ b/lib/puppet/provider/package/pkgdmg.rb
@@ -30,8 +30,9 @@ require 'facter/util/plist'
Puppet::Type.type(:package).provide :pkgdmg, :parent =>
Puppet::Provider::Package do
desc "Package management based on Apple's Installer.app and
DiskUtility.app. This package works by checking the contents of a DMG image
for Apple pkg or mpkg files. Any number of pkg or mpkg files may exist in the
root directory of the DMG file system. Sub directories are not checked for
packages. See `the wiki docs </trac/puppet/wiki/DmgPackages>` for more detail."
-
- confine :exists => "/Library/Receipts"
+
+ confine :operatingsystem => :darwin
+ defaultfor :operatingsystem => :darwin
commands :installer => "/usr/sbin/installer"
commands :hdiutil => "/usr/bin/hdiutil"
commands :curl => "/usr/bin/curl"
--
1.6.3.3
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
