force indented multiline operation

yast · Nov 26, 2014 · 97e78fe · 97e78fe
1 parent 802d845
commit 97e78fe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -143,11 +143,8 @@ Style/Lambda:
 Style/MethodName:
   Enabled: false
 
-# Offense count: 43
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/MultilineOperationIndentation:
-  Enabled: false
+  EnforcedStyle: indented
 
 # Offense count: 8
 Style/MultilineTernaryOperator:

diff --git a/src/include/bootloader/grub2/misc.rb b/src/include/bootloader/grub2/misc.rb
@@ -134,11 +134,11 @@ def grub_LocationProposal
 
       # refresh device map
       if BootStorage.device_map.empty?  ||
-        BootCommon.cached_settings_base_data_change_time !=
-            Storage.GetTargetChangeTime &&
-            # bnc#585824 - Bootloader doesn't use defined device map from autoyast
-            !((Mode.autoinst || Mode.autoupgrade) &&
-              BootCommon.cached_settings_base_data_change_time == nil)
+          BootCommon.cached_settings_base_data_change_time !=
+              Storage.GetTargetChangeTime &&
+              # bnc#585824 - Bootloader doesn't use defined device map from autoyast
+              !((Mode.autoinst || Mode.autoupgrade) &&
+                BootCommon.cached_settings_base_data_change_time == nil)
         BootStorage.device_map.propose
         BootCommon.InitializeLibrary(true, "grub2")
       end

diff --git a/src/lib/bootloader/disk_change_detector.rb b/src/lib/bootloader/disk_change_detector.rb
@@ -45,7 +45,7 @@ def changes
         # TRANSLATORS: %s stands for partition
         ret <<
           _("Selected custom bootloader partition %s is not available any more.") %
-            Yast::BootCommon.globals["boot_custom"]
+          Yast::BootCommon.globals["boot_custom"]
       end
 
       ret
@@ -64,7 +64,7 @@ def change_message(location, device)
 
     def boot_changed?
       boot_selected?("boot_boot") &&
-          actual_boot != Yast::BootStorage.BootPartitionDevice
+        actual_boot != Yast::BootStorage.BootPartitionDevice
     end
 
     def root_changed?

diff --git a/src/modules/BootStorage.rb b/src/modules/BootStorage.rb
@@ -218,7 +218,7 @@ def possible_locations_for_stage1
       partitions.select! do |p|
         [:primary, :extended, :logical, :sw_raid].include?(p["type"]) &&
           (p["used_fs"] || p["detected_fs"]) != :xfs &&
-        ["Linux native", "Extended", "Linux RAID", "MD RAID", "DM RAID"].include?(p["fstype"])
+          ["Linux native", "Extended", "Linux RAID", "MD RAID", "DM RAID"].include?(p["fstype"])
       end
 
       res = partitions.map { |p| p["device"] || "" }