summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/provider/group/suse.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--spec/functional/resource/group_spec.rb1
6 files changed, 10 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 1982e00e5f..945af1d260 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,10 +33,10 @@ GIT
PATH
remote: .
specs:
- chef (12.16.20)
+ chef (12.16.21)
addressable
bundler (>= 1.10)
- chef-config (= 12.16.20)
+ chef-config (= 12.16.21)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -62,10 +62,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.16.20-universal-mingw32)
+ chef (12.16.21-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.16.20)
+ chef-config (= 12.16.21)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -106,7 +106,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.16.20)
+ chef-config (12.16.21)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 4e85331d34..651681572d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.16.20 \ No newline at end of file
+12.16.21 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index c7864e8a79..7e54a92cd2 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "12.16.20"
+ VERSION = "12.16.21"
end
#
diff --git a/lib/chef/provider/group/suse.rb b/lib/chef/provider/group/suse.rb
index 273485df16..71336f9311 100644
--- a/lib/chef/provider/group/suse.rb
+++ b/lib/chef/provider/group/suse.rb
@@ -41,7 +41,7 @@ class Chef
requirements.assert(:create, :manage, :modify) do |a|
a.assertion do
begin
- to_add(@new_resource.members).any? { |member| Etc.getpwnam(member) }
+ to_add(@new_resource.members).all? { |member| Etc.getpwnam(member) }
rescue
false
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 835be31aca..a398616140 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "12.16.20"
+ VERSION = "12.16.21"
end
#
diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb
index 31f9933546..7effd386a4 100644
--- a/spec/functional/resource/group_spec.rb
+++ b/spec/functional/resource/group_spec.rb
@@ -425,6 +425,7 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" end
end
it "does not raise an error on manage" do
+ allow(Etc).to receive(:getpwnam).and_return(double("User"))
expect { group_resource.run_action(:manage) }.not_to raise_error
end
end