summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/chef/provider/package/zypper.rb3
-rw-r--r--spec/unit/provider/package/zypper_spec.rb4
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb
index 7d70fc3cd1..8575f2d6ed 100644
--- a/lib/chef/provider/package/zypper.rb
+++ b/lib/chef/provider/package/zypper.rb
@@ -92,7 +92,7 @@ class Chef
else
@candidate_version ||= package_name_array.each_with_index.map { |pkg, i| available_version(i) }
- end
+ end
end
def uri_scheme?(str)
@@ -164,7 +164,6 @@ class Chef
resolved_source_array.all? { |s| s && ::File.exist?(s) }
end
-
def zip(names, versions)
names.zip(versions).map do |n, v|
(v.nil? || v.empty?) ? n : "#{n}=#{v}"
diff --git a/spec/unit/provider/package/zypper_spec.rb b/spec/unit/provider/package/zypper_spec.rb
index d77059c180..024bb1b26d 100644
--- a/spec/unit/provider/package/zypper_spec.rb
+++ b/spec/unit/provider/package/zypper_spec.rb
@@ -170,7 +170,7 @@ describe Chef::Provider::Package::Zypper do
new_resource.source "/tmp/wget_1.11.4-1ubuntu1_amd64.deb"
allow(::File).to receive(:exist?).with("/tmp/wget_1.11.4-1ubuntu1_amd64.deb").and_return(true)
shell_out_expectation!(
- "zypper","--non-interactive", "install", "--auto-agree-with-licenses", "--oldpackage", "/tmp/wget_1.11.4-1ubuntu1_amd64.deb"
+ "zypper", "--non-interactive", "install", "--auto-agree-with-licenses", "--oldpackage", "/tmp/wget_1.11.4-1ubuntu1_amd64.deb"
)
provider.install_package(["emacs"], ["1.0"])
end
@@ -216,7 +216,7 @@ describe Chef::Provider::Package::Zypper do
new_resource.source "/tmp/wget_1.11.4-1ubuntu1_amd64.deb"
allow(::File).to receive(:exist?).with("/tmp/wget_1.11.4-1ubuntu1_amd64.deb").and_return(true)
shell_out_expectation!(
- "zypper","--non-interactive", "install", "--auto-agree-with-licenses", "--oldpackage", "/tmp/wget_1.11.4-1ubuntu1_amd64.deb"
+ "zypper", "--non-interactive", "install", "--auto-agree-with-licenses", "--oldpackage", "/tmp/wget_1.11.4-1ubuntu1_amd64.deb"
)
provider.upgrade_package(["emacs"], ["1.0"])
end