summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2021-04-30 09:49:39 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2021-04-30 09:49:39 -0700
commitb8ff3596335acc39f73593343a42d582a270207c (patch)
treeff89c9430283a334df9022537bff573312fea97f
parenta1ca5cfd227d3a8a97471f4c4dd7ca2121d4ac88 (diff)
downloadchef-b8ff3596335acc39f73593343a42d582a270207c.tar.gz
spellcheck
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--lib/chef/provider/package/yum.rb2
-rw-r--r--lib/chef/provider/package/yum/python_helper.rb10
-rw-r--r--lib/chef/provider/package/yum/yum_helper.py2
-rw-r--r--spec/functional/resource/yum_package_spec.rb2
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb
index eefc6b939f..121083ea46 100644
--- a/lib/chef/provider/package/yum.rb
+++ b/lib/chef/provider/package/yum.rb
@@ -238,7 +238,7 @@ class Chef
end
def flushcache
- python_helper.closerpmdb
+ python_helper.close_rpmdb
end
def yum_binary
diff --git a/lib/chef/provider/package/yum/python_helper.rb b/lib/chef/provider/package/yum/python_helper.rb
index 907f2ea4ad..19716ab06c 100644
--- a/lib/chef/provider/package/yum/python_helper.rb
+++ b/lib/chef/provider/package/yum/python_helper.rb
@@ -81,8 +81,8 @@ class Chef
start if stdin.nil?
end
- def closerpmdb
- query("closerpmdb", {})
+ def close_rpmdb
+ query("close_rpmdb", {})
end
def compare_versions(version1, version2)
@@ -122,11 +122,11 @@ class Chef
repo_opts = options_params(options || {})
parameters.merge!(repo_opts)
# XXX: for now we before and after every query with an enablerepo/disablerepo to clean the helpers internal state
- closerpmdb unless repo_opts.empty?
+ close_rpmdb unless repo_opts.empty?
query_output = query(action, parameters)
version = parse_response(query_output.lines.last)
Chef::Log.trace "parsed #{version} from python helper"
- closerpmdb unless repo_opts.empty?
+ close_rpmdb unless repo_opts.empty?
version
end
@@ -213,7 +213,7 @@ class Chef
ret
rescue EOFError, Errno::EPIPE, Timeout::Error, Errno::ESRCH => e
output = drain_fds
- if ( max_retries -= 1 ) > 0 && !ENV["YUMHELPER_NO_RETRIES"]
+ if ( max_retries -= 1 ) > 0 && !ENV["YUM_HELPER_NO_RETRIES"]
unless output.empty?
Chef::Log.trace "discarding output on stderr/stdout from python helper: #{output}"
end
diff --git a/lib/chef/provider/package/yum/yum_helper.py b/lib/chef/provider/package/yum/yum_helper.py
index 2621e9c8e3..560839eb54 100644
--- a/lib/chef/provider/package/yum/yum_helper.py
+++ b/lib/chef/provider/package/yum/yum_helper.py
@@ -214,7 +214,7 @@ try:
versioncompare(command['versions'])
elif command['action'] == "installonlypkgs":
install_only_packages(base, command['package'])
- elif command['action'] == "closerpmdb":
+ elif command['action'] == "close_rpmdb":
base.closeRpmDB()
base = None
outpipe.write('nil nil nil\n')
diff --git a/spec/functional/resource/yum_package_spec.rb b/spec/functional/resource/yum_package_spec.rb
index 627a72841b..2b08736d5b 100644
--- a/spec/functional/resource/yum_package_spec.rb
+++ b/spec/functional/resource/yum_package_spec.rb
@@ -49,7 +49,7 @@ describe Chef::Resource::YumPackage, :requires_root, external: exclude_test do
before(:each) do
# force errors to fail and not retry
- ENV["YUMHELPER_NO_RETRIES"] = "true"
+ ENV["YUM_HELPER_NO_RETRIES"] = "true"
File.open("/etc/yum.repos.d/chef-yum-localtesting.repo", "w+") do |f|
f.write <<~EOF
[chef-yum-localtesting]