Code improvements from review

yast · Aug 19, 2015 · a9ce29c · a9ce29c
1 parent 9504f03
commit a9ce29c
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/modules/Security.rb b/src/modules/Security.rb
@@ -415,7 +415,7 @@ def read_from_locations
           val = ""
           filename = nil
           if file.include?("sysconfig")
-            filename = "/etc" + file.gsub(".", "/")
+            filename = "/etc" + file.tr(".", "/")
             log.info "filename=#{filename}"
           end
           if filename.nil? || SCR.Read(path(".target.size"), filename) > 0
@@ -706,14 +706,13 @@ def apply_new_settings
     def activate_changes
       # NOTE: the call to #sort is only needed to satisfy the old testsuite
       @activation_mapping.sort.each do |setting, action|
-        if @Settings[setting] != @Settings_bak[setting]
-          log.info(
-            "Option #{setting} has been modified, "\
-            "activating the change: #{action}"
-          )
-          res = SCR.Execute(path(".target.bash"), action)
-          log.error "Activation failed" if res != 0
-        end
+        next if @Settings[setting] == @Settings_bak[setting]
+        log.info(
+          "Option #{setting} has been modified, "\
+          "activating the change: #{action}"
+        )
+        res = SCR.Execute(path(".target.bash"), action)
+        log.error "Activation failed" if res != 0
       end
     end