summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Waldt <git@yeoldegrove.de>2016-07-14 14:34:52 +0200
committerdheerajd-msys <dheeraj.dubey@msystechnologies.com>2017-06-23 13:04:49 +0530
commitf7c17d7e9522944536bf2c448deec1659593739d (patch)
treedbb8240fc2bd0e03f5dc952eaa3bb071b047991e
parent20bbe94cf218ae1210db4869200cb0814ccdd837 (diff)
downloadchef-dh/chef11_compatible__suse12.tar.gz
Made chef 11 compatible on Suse12dh/chef11_compatible__suse12
Signed-off-by: dheerajd-msys <dheeraj.dubey@msystechnologies.com>
-rw-r--r--lib/chef/provider/package/zypper.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb
index b288d5d954..5c03a5d8e8 100644
--- a/lib/chef/provider/package/zypper.rb
+++ b/lib/chef/provider/package/zypper.rb
@@ -44,19 +44,19 @@ class Chef
status = popen4("zypper --non-interactive info #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
stdout.each do |line|
case line
- when /^Version: (.+)$/
- version = $1
+ when /^Version *: (.+) *$/
+ version = $1.strip
Chef::Log.debug("#{@new_resource} version #{$1}")
- when /^Installed: Yes$/
+ when /^Installed *: Yes *$/
is_installed=true
Chef::Log.debug("#{@new_resource} is installed")
- when /^Installed: No$/
+ when /^Installed *: No *$/
is_installed=false
Chef::Log.debug("#{@new_resource} is not installed")
- when /^Status: out-of-date \(version (.+) installed\)$/
+ when /^Status *: out-of-date \(version (.+) installed\) *$/
is_out_of_date=true
- oud_version=$1
+ oud_version=$1.strip
Chef::Log.debug("#{@new_resource} out of date version #{$1}")
end
end