summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-04-13 11:42:12 -0700
committerTim Smith <tsmith84@gmail.com>2020-04-15 19:55:40 -0700
commit78afa84a0f67549331788cf0633bf2afcd674757 (patch)
tree2b8c029cc76502b3af03c00a7a7432628d59425c
parent0135fa506476a0f559ea609bd6690248dbc262d2 (diff)
downloadchef-78afa84a0f67549331788cf0633bf2afcd674757.tar.gz
Require at least train-core 3.2.28 to resolve sudo issues
Make sure that even a gem install of chef will work correctly here. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock10
-rw-r--r--chef.gemspec2
-rw-r--r--omnibus/Gemfile.lock10
3 files changed, 11 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4afe3f7676..c44f1d0a01 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,7 +55,7 @@ PATH
plist (~> 3.2)
proxifier (~> 1.0)
syslog-logger (~> 1.6)
- train-core (~> 3.1)
+ train-core (~> 3.2, >= 3.2.28)
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
@@ -88,7 +88,7 @@ PATH
plist (~> 3.2)
proxifier (~> 1.0)
syslog-logger (~> 1.6)
- train-core (~> 3.1)
+ train-core (~> 3.2, >= 3.2.28)
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
@@ -243,7 +243,7 @@ GEM
regexp_parser (~> 1.5)
uri_template (~> 0.7)
libyajl2 (1.2.0)
- license-acceptance (1.0.18)
+ license-acceptance (1.0.19)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)
@@ -281,7 +281,7 @@ GEM
net-ssh-gateway (>= 1.2.0)
nori (2.6.0)
parallel (1.19.1)
- parser (2.7.1.0)
+ parser (2.7.1.1)
ast (~> 2.4.0)
parslet (1.8.2)
pastel (0.7.3)
@@ -363,7 +363,7 @@ GEM
tins (1.24.1)
sync
tomlrb (1.3.0)
- train-core (3.2.27)
+ train-core (3.2.28)
addressable (~> 2.5)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
diff --git a/chef.gemspec b/chef.gemspec
index 3e2928d504..c8f3b614ee 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
s.add_dependency "chef-config", "= #{Chef::VERSION}"
s.add_dependency "chef-utils", "= #{Chef::VERSION}"
- s.add_dependency "train-core", "~> 3.1"
+ s.add_dependency "train-core", "~> 3.2", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635
s.add_dependency "train-winrm", ">= 0.2.5"
s.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.5"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 5a704b1df7..92f039f606 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -31,10 +31,10 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
artifactory (3.0.12)
awesome_print (1.8.0)
- aws-eventstream (1.0.3)
- aws-partitions (1.295.0)
- aws-sdk-core (3.93.0)
- aws-eventstream (~> 1.0, >= 1.0.2)
+ aws-eventstream (1.1.0)
+ aws-partitions (1.296.0)
+ aws-sdk-core (3.94.0)
+ aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
@@ -306,7 +306,7 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
- train-core (3.2.27)
+ train-core (3.2.28)
addressable (~> 2.5)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)