Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/259706
Change subject: RuboCop: fixed Style/CommandLiteral offense ...................................................................... RuboCop: fixed Style/CommandLiteral offense Use backticks around command string. Change-Id: I1c152773e01fa575f2d78a3f07d6e081af9ba789 See: https://github.com/bbatsov/ruby-style-guide#percent-x Bug: T112651 --- M .rubocop_todo.yml M modules/apt/lib/facter/apt.rb M modules/ganeti/lib/facter/ganeti.rb M modules/gridengine/lib/puppet/provider/gridengine_resource/parsed.rb 4 files changed, 3 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/06/259706/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 1ad9f5f..fffed62 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -87,15 +87,6 @@ - 'modules/base/lib/facter/physicalcorecount.rb' - 'modules/puppetmaster/lib/puppet/reports/logstash.rb' -# Offense count: 3 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerBackticks. -Style/CommandLiteral: - Exclude: - - 'modules/apt/lib/facter/apt.rb' - - 'modules/ganeti/lib/facter/ganeti.rb' - - 'modules/gridengine/lib/puppet/provider/gridengine_resource/parsed.rb' - # Offense count: 1 # Cop supports --auto-correct. Style/DefWithParentheses: diff --git a/modules/apt/lib/facter/apt.rb b/modules/apt/lib/facter/apt.rb index 9cea99f..f977675 100644 --- a/modules/apt/lib/facter/apt.rb +++ b/modules/apt/lib/facter/apt.rb @@ -1,6 +1,6 @@ Facter.add("package_updates") do confine :operatingsystem => %w{Debian Ubuntu} setcode do - %x{/usr/local/bin/apt2xml 2>/dev/null}.chomp + `/usr/local/bin/apt2xml 2>/dev/null`.chomp end end diff --git a/modules/ganeti/lib/facter/ganeti.rb b/modules/ganeti/lib/facter/ganeti.rb index 1a42493..211bdd4 100644 --- a/modules/ganeti/lib/facter/ganeti.rb +++ b/modules/ganeti/lib/facter/ganeti.rb @@ -3,7 +3,7 @@ setcode do if File.exists?("/var/lib/ganeti/ssconf_cluster_name") then - cmdline = %x{cat /var/lib/ganeti/ssconf_cluster_name}.chomp + cmdline = `cat /var/lib/ganeti/ssconf_cluster_name`.chomp end end end diff --git a/modules/gridengine/lib/puppet/provider/gridengine_resource/parsed.rb b/modules/gridengine/lib/puppet/provider/gridengine_resource/parsed.rb index e2bd3a4..16543d1 100644 --- a/modules/gridengine/lib/puppet/provider/gridengine_resource/parsed.rb +++ b/modules/gridengine/lib/puppet/provider/gridengine_resource/parsed.rb @@ -28,7 +28,7 @@ # default. def read - %x{qconf -sc} + `qconf -sc` end def write(text) -- To view, visit https://gerrit.wikimedia.org/r/259706 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c152773e01fa575f2d78a3f07d6e081af9ba789 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Zfilipin <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
