diff options
| author | Stuart Preston <stuart@chef.io> | 2018-06-20 14:26:32 +0100 |
|---|---|---|
| committer | Stuart Preston <stuart@chef.io> | 2018-06-20 14:26:32 +0100 |
| commit | eaac3e8f2fb695b47cde9b595e87d83e3b23d984 (patch) | |
| tree | 42455e9b395ecc14fc7f3aaa9f875abefd620cbf /lib/chef/provider/package/apt.rb | |
| parent | 08bd853e9fe52a92c310e1ff2a5171324998b593 (diff) | |
| parent | f960c7f3b7c58c80a2e104ed631d97190b272b4e (diff) | |
| download | chef-eaac3e8f2fb695b47cde9b595e87d83e3b23d984.tar.gz | |
Merge branch 'master' into sp/ffi-powershell
Signed-off-by: <>
Diffstat (limited to 'lib/chef/provider/package/apt.rb')
| -rw-r--r-- | lib/chef/provider/package/apt.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/package/apt.rb b/lib/chef/provider/package/apt.rb index b644848442..f245e481a3 100644 --- a/lib/chef/provider/package/apt.rb +++ b/lib/chef/provider/package/apt.rb @@ -81,7 +81,7 @@ class Chef def locked_packages @locked_packages ||= begin - locked = shell_out_compact!("apt-mark", "showhold") + locked = shell_out!("apt-mark", "showhold") locked.stdout.each_line.map do |line| line.strip end @@ -140,9 +140,9 @@ class Chef # # @return [Integer] 1 if v1 > v2. 0 if they're equal. -1 if v1 < v2 def version_compare(v1, v2) - if !shell_out_compact("dpkg", "--compare-versions", v1.to_s, "gt", v2.to_s).error? + if !shell_out("dpkg", "--compare-versions", v1.to_s, "gt", v2.to_s).error? 1 - elsif !shell_out_compact("dpkg", "--compare-versions", v1.to_s, "eq", v2.to_s).error? + elsif !shell_out("dpkg", "--compare-versions", v1.to_s, "eq", v2.to_s).error? 0 else -1 @@ -153,7 +153,7 @@ class Chef # interactive prompts. Command is run with default localization rather # than forcing locale to "C", so command output may not be stable. def run_noninteractive(*args) - shell_out_compact!(*args, env: { "DEBIAN_FRONTEND" => "noninteractive" }) + shell_out!(*args, env: { "DEBIAN_FRONTEND" => "noninteractive" }) end def default_release_options |