summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-09-25 15:37:15 -0700
committerTim Smith <tsmith@chef.io>2017-09-28 11:04:54 -0700
commit0cfb61b52d5a1fb61c94c37cea6d4b1eba36f4a9 (patch)
tree567fefedddb66f4b180d187aa8c68ca5f8d89dab
parentc6d924c93ef2000aaa2da6838903068bccf61bad (diff)
downloadchef-0cfb61b52d5a1fb61c94c37cea6d4b1eba36f4a9.tar.gz
Run everything with --quiet and --non-interactive and move gpg import
GPG import doesn't actually work here. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/provider/zypper_repository.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/zypper_repository.rb b/lib/chef/provider/zypper_repository.rb
index 2cc72d14ff..257cc7da61 100644
--- a/lib/chef/provider/zypper_repository.rb
+++ b/lib/chef/provider/zypper_repository.rb
@@ -53,14 +53,14 @@ class Chef
end
action :delete do
- declare_resource(:execute, "zypper removerepo #{escaped_repo_name}") do
- only_if "zypper lr #{escaped_repo_name}"
+ declare_resource(:execute, "zypper --quiet --non-interactive removerepo #{escaped_repo_name}") do
+ only_if "zypper --quiet lr #{escaped_repo_name}"
end
end
action :refresh do
- declare_resource(:execute, "zypper#{' --gpg-auto-import-keys' if new_resource.gpgautoimportkeys} --quiet --no-confirm refresh --force #{escaped_repo_name}") do
- only_if "zypper lr #{escaped_repo_name}"
+ declare_resource(:execute, "zypper --quiet --non-interactive refresh --force #{escaped_repo_name}") do
+ only_if "zypper --quiet lr #{escaped_repo_name}"
end
end