diff options
| author | Scott Hain <shain@getchef.com> | 2014-06-17 14:24:03 -0700 |
|---|---|---|
| committer | Scott Hain <shain@getchef.com> | 2014-06-17 14:24:03 -0700 |
| commit | 2d16254da21fee985b6b01fc59dade436b9743d3 (patch) | |
| tree | c5e9d7967d66ce102b5e14a2ab0b9584524d17e4 /lib/chef/provider/package/rpm.rb | |
| parent | 76828f507b3d0654af83c22ca7ad48b8e36ed333 (diff) | |
| download | chef-2d16254da21fee985b6b01fc59dade436b9743d3.tar.gz | |
Updated tests with more complicated data, fixed regex. Resolves CHEF-4893
Diffstat (limited to 'lib/chef/provider/package/rpm.rb')
| -rw-r--r-- | lib/chef/provider/package/rpm.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/provider/package/rpm.rb b/lib/chef/provider/package/rpm.rb index 2aa4e01e68..74baddb062 100644 --- a/lib/chef/provider/package/rpm.rb +++ b/lib/chef/provider/package/rpm.rb @@ -60,7 +60,7 @@ class Chef status = popen4("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}") do |pid, stdin, stdout, stderr| stdout.each do |line| case line - when /([\w\d_.-]+)\s([\w\d_.-]+)/ + when /([\w\d+_.-]+)\s([\w\d_.-]+)/ @current_resource.package_name($1) @new_resource.version($2) @candidate_version = $2 @@ -78,7 +78,7 @@ class Chef @rpm_status = popen4("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@current_resource.package_name}") do |pid, stdin, stdout, stderr| stdout.each do |line| case line - when /([\w\d_.-]+)\s([\w\d_.-]+)/ + when /([\w\d+_.-]+)\s([\w\d_.-]+)/ Chef::Log.debug("#{@new_resource} current version is #{$2}") @current_resource.version($2) end |