summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-02-18 12:34:41 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2015-02-18 12:34:41 -0800
commited8f3ab254699345ca7856b39db3769b63c25b89 (patch)
treec14f35a7230a9c09a3264a731eb74f18ee8be7b3
parent6909f4074dbd9cee5906333f693bd282476a6ac5 (diff)
parent817b258457fd259ceab044bf5d6cb1671d1596fa (diff)
downloadchef-ed8f3ab254699345ca7856b39db3769b63c25b89.tar.gz
Merge pull request #2934 from ClogenyTechnologies/kd/rpm-fix
Dont raise exceptions in load_current_resource when checking current status
-rw-r--r--lib/chef/provider/package/rpm.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider/package/rpm.rb b/lib/chef/provider/package/rpm.rb
index fa784c2943..f10fe23c71 100644
--- a/lib/chef/provider/package/rpm.rb
+++ b/lib/chef/provider/package/rpm.rb
@@ -76,7 +76,7 @@ class Chef
end
Chef::Log.debug("#{@new_resource} checking install state")
- @rpm_status = shell_out!("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@current_resource.package_name}")
+ @rpm_status = shell_out("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@current_resource.package_name}")
@rpm_status.stdout.each_line do |line|
case line
when /^([\w\d+_.-]+)\s([\w\d_.-]+)$/