summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Waldt <git@yeoldegrove.de>2016-07-14 14:34:52 +0200
committerEike Waldt <git@yeoldegrove.de>2016-07-14 14:34:52 +0200
commit7aea73163a2eef5603ecc9433895d81e05d26a17 (patch)
tree36912af5ad63be347f58b4b8a3343f7be138697b
parent99c7bbf32fb3dbc1d9e80370a68b256b7e939e0d (diff)
downloadchef-7aea73163a2eef5603ecc9433895d81e05d26a17.tar.gz
Fixed regex for zypper version 1.13.*. This is backward compatible with zypper version 1.12.*
-rw-r--r--lib/chef/provider/package/zypper.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb
index 5ee1dbea8e..e20a7332f7 100644
--- a/lib/chef/provider/package/zypper.rb
+++ b/lib/chef/provider/package/zypper.rb
@@ -38,15 +38,15 @@ class Chef
status = shell_out_with_timeout!("zypper --non-interactive info #{package_name}")
status.stdout.each_line do |line|
case line
- when /^Version: (.+)$/
- candidate_version = $1
- Chef::Log.debug("#{new_resource} version #{$1}")
- when /^Installed: Yes$/
+ when /^Version *: (.+) *$/
+ candidate_version = $1.strip
+ Chef::Log.debug("#{new_resource} version #{candidate_version}")
+ when /^Installed *: Yes *$/
is_installed = true
Chef::Log.debug("#{new_resource} is installed")
- when /^Status: out-of-date \(version (.+) installed\)$/
- current_version = $1
- Chef::Log.debug("#{new_resource} out of date version #{$1}")
+ when /^Status *: out-of-date \(version (.+) installed\) *$/
+ current_version = $1.strip
+ Chef::Log.debug("#{new_resource} out of date version #{current_version}")
end
end
current_version = candidate_version if is_installed