diff options
| author | Phil Dibowitz <phil@ipom.com> | 2016-05-05 11:19:52 -0700 |
|---|---|---|
| committer | Phil Dibowitz <phil@ipom.com> | 2016-05-05 11:19:52 -0700 |
| commit | e24f6d309685cc1effb89ea797e373e9b1b04b49 (patch) | |
| tree | 1660b7b7544fb3f9c56dd18ed29c4bbff3f7e3f7 | |
| parent | af4c3920ec2184f8282160b7fe3d4fd332de48f3 (diff) | |
| parent | 900f711b1a2375e657a88ce16900a2d73d913743 (diff) | |
| download | chef-e24f6d309685cc1effb89ea797e373e9b1b04b49.tar.gz | |
Merge pull request #4760 from svmastersamurai/fix_choco_nil_chomp
Chocolatey Package Provider chomps nil object
| -rw-r--r-- | lib/chef/provider/package/chocolatey.rb | 1 | ||||
| -rw-r--r-- | spec/unit/provider/package/chocolatey_spec.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/chef/provider/package/chocolatey.rb b/lib/chef/provider/package/chocolatey.rb index 44fb1de235..ebd3f987cd 100644 --- a/lib/chef/provider/package/chocolatey.rb +++ b/lib/chef/provider/package/chocolatey.rb @@ -256,6 +256,7 @@ EOS def parse_list_output(*args) list = [] choco_command(*args).stdout.each_line do |line| + next if line.start_with?("Chocolatey v") name, version = line.split("|") list << [ name.downcase, version.chomp ] end diff --git a/spec/unit/provider/package/chocolatey_spec.rb b/spec/unit/provider/package/chocolatey_spec.rb index 8a69cf3da4..8eaa69b598 100644 --- a/spec/unit/provider/package/chocolatey_spec.rb +++ b/spec/unit/provider/package/chocolatey_spec.rb @@ -36,6 +36,7 @@ describe Chef::Provider::Package::Chocolatey do # installed packages (ConEmu is upgradable) let(:local_list_stdout) do <<-EOF +Chocolatey v0.9.9.11 chocolatey|0.9.9.11 ConEmu|15.10.25.0 EOF @@ -50,6 +51,7 @@ ConEmu|15.10.25.0 def allow_remote_list(package_names, args = nil) remote_list_stdout = <<-EOF +Chocolatey v0.9.9.11 chocolatey|0.9.9.11 ConEmu|15.10.25.1 Git|2.6.1 |