Skip to content

Commit 4a4e321

Browse files
trevor-vaughanop-ct
authored andcommitted
Use the ignores capability from simp-rake-helpers
* Bump the version of `simp-rake-helpers` * Update the RPM deps file to use `ignores` instead of overriding everything Closes: #855 Needs: simp/rubygem-simp-rake-helpers#196
1 parent 1bbbd9b commit 4a4e321

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ group :test do
2020
gem 'puppet-lint-empty_string-check', :require => false
2121
gem 'puppet-lint-trailing_comma-check', :require => false
2222
gem 'simp-rspec-puppet-facts', ENV['SIMP_RSPEC_PUPPET_FACTS_VERSION'] || '~> 3.1'
23-
gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.15.0', '< 6']
23+
gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.17.0', '< 6']
2424
gem( 'pdk', ENV['PDK_VERSION'] || '~> 2.0', :require => false) if major_puppet_version > 5
2525
gem 'pathspec', '~> 0.2' if Gem::Requirement.create('< 2.6').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2626
gem 'simp-build-helpers', ENV['SIMP_BUILD_HELPERS_VERSION'] || ['> 0.1', '< 2.0']

build/rpm/dependencies.yaml

+2-14
Original file line numberDiff line numberDiff line change
@@ -148,20 +148,8 @@
148148
# each optional dependency is translated to a Requires in a SIMP-generated
149149
# puppet module RPM, we need to exclude this optional dependency.
150150
'ssh':
151-
:requires:
152-
# exclude pupmod-puppet-selinux
153-
- pupmod-herculesteam-augeasproviders_core
154-
- pupmod-herculesteam-augeasproviders_ssh
155-
- pupmod-puppetlabs-stdlib
156-
- pupmod-simp-simplib
157-
- pupmod-simp-haveged
158-
- pupmod-simp-iptables
159-
- pupmod-simp-oath
160-
- pupmod-simp-pki
161-
- pupmod-simp-tcpwrappers
162-
- pupmod-simp-pam
163-
- pupmod-simp-selinux
164-
- pupmod-simp-vox_selinux
151+
:ignores:
152+
- pupmod-puppet-selinux
165153

166154
# Vox Pupuli has assumed ownership of the this project
167155
'snmp':

0 commit comments

Comments
 (0)