Skip to content

Commit 949c600

Browse files
authored
Merge pull request #303 from puppetlabs/maint-rubocop_fixes
(maint) - fix rubocop
2 parents 8e78b5f + 82387b8 commit 949c600

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
steps:
2323
- name: "Checkout"
2424
uses: "actions/checkout@v3"
25+
with:
26+
ref: ${{ github.event.pull_request.head.sha }}}
2527

2628
- name: "Setup ruby"
2729
uses: "ruby/setup-ruby@v1"
@@ -50,6 +52,8 @@ jobs:
5052

5153
- name: "Checkout"
5254
uses: "actions/checkout@v3"
55+
with:
56+
ref: ${{ github.event.pull_request.head.sha }}}
5357

5458
- name: "Setup ruby"
5559
uses: "ruby/setup-ruby@v1"

lib/facter/lvm_support.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
setcode do
3636
pvs = Facter::Core::Execution.execute("vgs -o pv_name #{vg} 2>/dev/null", timeout: 30)
3737
res = nil
38-
unless pvs.nil?
39-
res = pvs.split("\n").select { |l| l =~ %r{^\s+/} }.map(&:strip).sort.join(',')
40-
end
38+
res = pvs.split("\n").grep(%r{^\s+/}).map(&:strip).sort.join(',') unless pvs.nil?
4139
res
4240
end
4341
end

0 commit comments

Comments
 (0)