diff options
author | Vasiliy Tolstov <v.tolstov@selfip.ru> | 2014-06-22 00:55:58 +0400 |
---|---|---|
committer | Vasiliy Tolstov <v.tolstov@selfip.ru> | 2014-06-22 00:55:58 +0400 |
commit | f9120d1656cbb6131964910c34cebd2bfa2fc918 (patch) | |
tree | 2ea3dd6fccca283ab387eaea7d193a82b443a7c4 | |
parent | 67125c12018d07856fd7dca193131790ce2e12d2 (diff) | |
download | chef-f9120d1656cbb6131964910c34cebd2bfa2fc918.tar.gz |
remove named groups in regexp
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
-rw-r--r-- | lib/chef/provider/package/paludis.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/package/paludis.rb b/lib/chef/provider/package/paludis.rb index d4b6d2f4e9..e304cd3b8e 100644 --- a/lib/chef/provider/package/paludis.rb +++ b/lib/chef/provider/package/paludis.rb @@ -35,19 +35,19 @@ class Chef Chef::Log.debug("Checking package status for #{@new_resource.package_name}") installed = false - re = Regexp.new('(?<name>(.*))[[:blank:]](?<version>(.*))[[:blank:]](?<repository>(.*))$') + re = Regexp.new('(.*)[[:blank:]](.*)[[:blank:]](.*)$') shell_out!("cave -L warning print-ids -m \"*/#{@new_resource.package_name.split('/').last}\" -f \"%c/%p %v %r\n\"").stdout.each_line do |line| res = re.match(line) unless res.nil? - case res[:repository] + case res[3] when 'accounts', 'installed-accounts' next when 'installed' installed = true - @current_resource.version(res[:version]) + @current_resource.version(res[2]) else - @candidate_version = res[:version] + @candidate_version = res[2] @current_resource.version(nil) end end |