summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Sedlacek <dansedlacek@fb.com>2016-03-24 15:56:29 -0700
committerDan Sedlacek <dansedlacek@fb.com>2016-03-28 17:29:34 -0700
commitb1a0d6cb61504a0f076f349f08c2f21573c4089f (patch)
tree56584b8140faa52939fb3e124630d36e31a24f4b
parent17764c360480e489d575c9aed5ebc66df35ff854 (diff)
downloadchef-b1a0d6cb61504a0f076f349f08c2f21573c4089f.tar.gz
updated code + specs
-rw-r--r--lib/chef/provider/package/chocolatey.rb1
-rw-r--r--spec/unit/provider/package/chocolatey_spec.rb2
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..cf0220b708 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')
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