Skip to content

Commit

Permalink
Fix facts for python rc version
Browse files Browse the repository at this point in the history
  • Loading branch information
krissik committed Mar 25, 2019
1 parent e87db52 commit f29edbd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/facter/python_release.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

def get_python_release(executable)
if Facter::Util::Resolution.which(executable) # rubocop:disable Style/GuardClause
results = Facter::Util::Resolution.exec("#{executable} -V 2>&1").match(%r{^.*(\d+\.\d+)\.\d+\+?$})
results = Facter::Util::Resolution.exec("#{executable} -V 2>&1").match(%r{^.*(\d+\.\d+)\.\d+\+?(?:rc\d+)?$})
results[1] if results
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/facter/python_version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

def get_python_version(executable)
if Facter::Util::Resolution.which(executable) # rubocop:disable Style/GuardClause
results = Facter::Util::Resolution.exec("#{executable} -V 2>&1").match(%r{^.*(\d+\.\d+\.\d+\+?)$})
results = Facter::Util::Resolution.exec("#{executable} -V 2>&1").match(%r{^.*(\d+\.\d+\.\d+\+?(?:rc\d+)?)$})
results[1] if results
end
end
Expand Down

0 comments on commit f29edbd

Please sign in to comment.