Merge 2f979d7 into 89e21fc

.travis.yml

@@ -5,7 +5,7 @@ before_install:
     # disable rvm, use system Ruby
     - rvm reset
     - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "yast2-devtools yast2 yast2-packager yast2-installation yast2-update yast2-country rake" -g "gettext yast-rake yard rspec:3.3.0 simplecov coveralls rubocop:0.29.1"
+    - sh ./travis_setup.sh -p "yast2-devtools yast2 yast2-packager yast2-installation yast2-update yast2-country rake" -g "gettext yast-rake yard rspec:3.3.0 simplecov coveralls rubocop:0.41.2"
 script:
     - rake check:syntax
     - rake check:pot

src/lib/migration/main_workflow.rb

@@ -41,11 +41,11 @@ class MainWorkflow
     include Yast::I18n
 
     FIND_CONFIG_CMD = "/usr/bin/snapper --no-dbus list-configs | " \
-      "grep \"^root \" >/dev/null"
+      "grep \"^root \" >/dev/null".freeze
 
     CREATE_SNAPSHOT_CMD = "/usr/bin/snapper create --type=%{snapshot_type} " \
       "--cleanup-algorithm=number --print-number --userdata important=yes " \
-      "--description=\"%{description}\""
+      "--description=\"%{description}\"".freeze
 
     def self.run
       workflow = new
@@ -88,7 +88,7 @@ def run
         next:    "repositories"
       },
       "restart_after_update"    => {
-        restart:  :restart
+        restart: :restart
       },
       "repositories"            => {
         abort:    :abort,
@@ -108,7 +108,7 @@ def run
         next:  "restart_after_migration"
       },
       "restart_after_migration" => {
-        restart:  :restart
+        restart: :restart
       },
       # note: the steps after the YaST restart use the new code from
       # the updated (migrated) yast2-migration package!!
@@ -123,7 +123,7 @@ def run
         abort: :abort,
         next:  :next
       }
-    }
+    }.freeze
 
     def aliases
       {
@@ -218,7 +218,8 @@ def display_abort_message
             "\n" \
             "We strongly recommend to rollback to a snapshot created before the\n" \
             "migration was started (via selecting the snapshot in the boot menu\n" \
-            "if you use snapper) or restore the system from a backup."))
+            "if you use snapper) or restore the system from a backup.")
+      )
     end
 
     def create_pre_snapshot

src/lib/migration/proposal_client.rb

@@ -23,7 +23,7 @@ class ProposalClient < ::Installation::ProposalClient
     include Yast::I18n
 
     # ID prefix used in the proposal links
-    LINK_PREFIX = "migration--disable_repository_"
+    LINK_PREFIX = "migration--disable_repository_".freeze
 
     def initialize
       Yast.import "Pkg"
@@ -173,7 +173,7 @@ def proposal_warning(warnings, links)
     def disable_repo(link)
       log.info "Activated link: #{link}"
 
-      link.match(/^#{LINK_PREFIX}(\d+)/)
+      link =~ /^#{LINK_PREFIX}(\d+)/
       repo = Regexp.last_match(1).to_i
 
       log.info "Disabling repository #{repo}"

src/lib/migration/proposal_store.rb

@@ -28,10 +28,10 @@ class ProposalStore < Installation::ProposalStore
     include Yast::Logger
     include Yast::I18n
 
-    PROPOSAL_NAMES = ["migration_proposal", "packages_proposal"]
+    PROPOSAL_NAMES = ["migration_proposal", "packages_proposal"].freeze
     PROPOSAL_PROPERTIES = {
       "enable_skip" => "false"
-    }
+    }.freeze
     MODULES_ORDER = PROPOSAL_NAMES
 
     def initialize(_unused_mode)