components/puppet/files/solaris/lib/puppet/provider/pkg_publisher/solaris.rb
branchs11-update
changeset 3415 e7a2a94a22a2
parent 2928 43b3da52b84a
--- a/components/puppet/files/solaris/lib/puppet/provider/pkg_publisher/solaris.rb	Mon Oct 20 23:00:15 2014 -0700
+++ b/components/puppet/files/solaris/lib/puppet/provider/pkg_publisher/solaris.rb	Tue Oct 21 10:13:39 2014 -0700
@@ -134,13 +134,6 @@
 
     def build_flags
         flags = []
-        if enable = @resource[:enable] and enable != nil
-            if enable == :true
-                flags << "--enable"
-            elsif enable == :false
-                flags << "--disable"
-            end
-        end
 
         if searchfirst = @resource[:searchfirst] and searchfirst != ""
             if searchfirst == :true
@@ -236,6 +229,13 @@
     # required puppet functions
     def create
         pkg("set-publisher", build_flags, build_origin, @resource[:name])
+        # pkg(5) does not allow for a new publisher to be set with the disabled
+        # flag, so check for it after setting the publisher
+        if enable = @resource[:enable] and enable != nil
+            if enable == :false
+                pkg("set-publisher", "--disable", @resource[:name])
+            end
+        end
     end
 
     def destroy