Skip to content

Commit af6a13c

Browse files
author
cthorn42
authored
Merge pull request #8895 from jplindquist/PUP-11475
(PUP-11475) Add install_options when listing available_versions
2 parents f5a23ce + 73c6451 commit af6a13c

File tree

1 file changed

+8
-3
lines changed
  • lib/puppet/provider/package

1 file changed

+8
-3
lines changed

lib/puppet/provider/package/yum.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def best_version(should)
204204
return should
205205
end
206206
versions = []
207-
available_versions(@resource[:name]).each do |version|
207+
available_versions(@resource[:name], disablerepo, enablerepo, disableexcludes).each do |version|
208208
begin
209209
rpm_version = RPM_VERSION.parse(version)
210210
versions << rpm_version if should_range.include?(rpm_version)
@@ -225,8 +225,13 @@ def best_version(should)
225225
end
226226
end
227227

228-
def available_versions(package_name)
229-
output = execute("yum list #{package_name} --showduplicates | sed -e '1,/Available Packages/ d' | awk '{print $2}'")
228+
def available_versions(package_name, disablerepo, enablerepo, disableexcludes)
229+
args = [command(:cmd), 'list', package_name, '--showduplicates']
230+
args.concat(disablerepo.map { |repo| ["--disablerepo=#{repo}"] }.flatten)
231+
args.concat(enablerepo.map { |repo| ["--enablerepo=#{repo}"] }.flatten)
232+
args.concat(disableexcludes.map { |repo| ["--disableexcludes=#{repo}"] }.flatten)
233+
234+
output = execute("#{args.compact.join(' ')} | sed -e '1,/Available Packages/ d' | awk '{print $2}'")
230235
output.split("\n")
231236
end
232237

0 commit comments

Comments
 (0)