make rubocop happy

yast · Nov 18, 2015 · bedfa3e · bedfa3e
1 parent f30c7d7
commit bedfa3e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 25 deletions.
diff --git a/src/include/bootloader/grub2/options.rb b/src/include/bootloader/grub2/options.rb
@@ -194,9 +194,7 @@ def ConsoleStore(_widget, _event)
       use_serial = UI.QueryWidget(Id(:console_frame), :Value)
       use_gfxterm = UI.QueryWidget(Id(:gfxterm_frame), :Value)
 
-      if use_gfxterm && use_serial
-        use_gfxterm = false
-      end
+      use_gfxterm = false if use_gfxterm && use_serial
 
       if use_serial
         console_value = UI.QueryWidget(Id(:console_args), :Value)
@@ -361,11 +359,11 @@ def Grub2Options
           "store"  => fun_ref(method(:store_os_prober), "void (string, map)")
         },
         "append"      => {
-          "widget"=> :textentry,
-          "label" => @grub2_descriptions["append"],
-          "help"  => @grub2_help_messages["append"],
-          "init"  => fun_ref(method(:init_append), "void (string)"),
-          "store" => fun_ref(method(:store_append), "void (string, map)")
+          "widget" => :textentry,
+          "label"  => @grub2_descriptions["append"],
+          "help"   => @grub2_help_messages["append"],
+          "init"   => fun_ref(method(:init_append), "void (string)"),
+          "store"  => fun_ref(method(:store_append), "void (string, map)")
         },
         "vgamode"     => {
           "widget" => :combobox,

diff --git a/src/lib/bootloader/grub2base.rb b/src/lib/bootloader/grub2base.rb
@@ -62,10 +62,10 @@ def pmbr_setup(action, *devices)
     # Propose global options of bootloader
     def StandardGlobals
       {
-        "default"   => "0",
-        "vgamode"   => "",
-        "gfxmode"   => "auto",
-        "activate"  => Arch.ppc ? "true" : "false"
+        "default"  => "0",
+        "vgamode"  => "",
+        "gfxmode"  => "auto",
+        "activate" => Arch.ppc ? "true" : "false"
       }
     end
 
@@ -181,16 +181,16 @@ def serial_console_matcher
 
     def propose_os_probing
       os_prober = grub_default.os_prober
-      if !os_prober.defined?
-        # s390 do not have os_prober, see bnc#868909#c2
-        # ppc have slow os_prober, see boo#931653
-        disable_os_prober = (Arch.s390 || Arch.ppc) ||
-          ProductFeatures.GetBooleanFeature("globals", "disable_os_prober")
-        if disable_os_prober
-          os_prober.disable
-        else
-          os_prober.enable
-        end
+      return if os_prober.defined?
+
+      # s390 do not have os_prober, see bnc#868909#c2
+      # ppc have slow os_prober, see boo#931653
+      disable_os_prober = (Arch.s390 || Arch.ppc) ||
+        ProductFeatures.GetBooleanFeature("globals", "disable_os_prober")
+      if disable_os_prober
+        os_prober.disable
+      else
+        os_prober.enable
       end
     end
 
@@ -212,6 +212,5 @@ def propose_serial
 
       grub_default.serial_console = console.console_args
     end
-
   end
 end
diff --git a/src/lib/bootloader/serial_console.rb b/src/lib/bootloader/serial_console.rb
@@ -75,8 +75,8 @@ def self.load_from_console_args(console_args)
       new(unit, speed, parity, word)
     end
 
-    def initialize(unit, speed=SPEED_DEFAULT, parity=PARITY_DEFAULT,
-        word=WORD_DEFAULT)
+    def initialize(unit, speed = SPEED_DEFAULT, parity = PARITY_DEFAULT,
+        word = WORD_DEFAULT)
       @unit = unit
       @speed = speed
       @parity = parity