Merge branch '0.24.x'

2 files changed, 41 insertions, 4 deletions

diff --git a/lib/puppet/provider/package/hpux.rb b/lib/puppet/provider/package/hpux.rb
new file mode 100644
index 000000000..aa756ead0
--- /dev/null
+++ b/lib/puppet/provider/package/hpux.rb
@@ -0,0 +1,41 @@
+# HP-UX packaging.
+
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package do
+    desc "HP-UX's packaging system."
+    commands :swinstall => "/usr/sbin/swinstall",
+             :swlist => "/usr/sbin/swlist",
+             :swremove => "/usr/sbin/swremove"
+    defaultfor :operatingsystem => 'hp-ux'
+    
+    def self.instances
+        # TODO:  This is very hard on HP-UX!
+        []
+    end
+    
+    # source and name are required
+    def install
+        raise ArgumentError, "source must be provided to install HP-UX packages" unless resource[:source]
+        args = standard_args + ["-s", resource[:source], resource[:name]]
+        swinstall(*args)
+    end
+    
+    def query
+        begin
+            swlist resource[:name]
+            {:ensure => :present}
+        rescue
+            {:ensure => :absent}
+        end
+    end
+    
+    def uninstall
+        args = standard_args + [resource[:name]]
+        swremove(*args)
+    end
+    
+    def standard_args
+        return ["-x", "mount_all_filesystems=false"]
+    end
+end
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index b6855dfa5..64bb40b52 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -558,10 +558,6 @@ These parameters affect the required permissions of any files specified after
 their specification.  Puppet will sometimes use these parameters to check its
 own configured state, so they can be used to make Puppet a bit more self-managing.
 
-Note also that the section names are entirely for human-level organizational
-purposes; they don't provide separate namespaces.  All parameters are in a
-single namespace.
-
 Generated on #{Time.now}.
 
 }.gsub(/^/, "# ")