Make rubocop happy.

yast · Sep 1, 2017 · 19f9954 · 19f9954
1 parent a4901ef
commit 19f9954
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/modules/Packages.rb b/src/modules/Packages.rb
@@ -2511,15 +2511,15 @@ def patterns_to_install
     end
 
     def report_missing_pattern(pattern_name)
-      unless (default_patterns | resolvable_mandatory_patterns).include?(pattern_name)
-        log.info "Optional pattern #{pattern_name} does not exist, skipping..."
-      else
+      if (default_patterns | resolvable_mandatory_patterns).include?(pattern_name)
         log.error "Mandatory pattern #{pattern_name} does not exist"
         # Error message, %{pattern_name} is replaced with the missing pattern name in runtime
         Report.Error(_(
           "Failed to select default product pattern %{pattern_name}.\n" \
           "Pattern has not been found."
         ) % { pattern_name: pattern_name })
+      else
+        log.info "Optional pattern #{pattern_name} does not exist, skipping..."
       end
     end
 

diff --git a/test/packages_test.rb b/test/packages_test.rb
@@ -274,7 +274,8 @@ def product(properties = {})
       allow(Yast::Packages).to receive(:default_patterns).and_return([])
       allow(Yast::Packages).to receive(:optional_default_patterns)
         .and_return(optional_default_patterns)
-      allow(Yast::Packages).to receive(:ComputeSystemPatternList).and_return(optional_default_patterns)
+      allow(Yast::Packages).to receive(:ComputeSystemPatternList)
+        .and_return(optional_default_patterns)
       allow(Yast::Pkg).to receive(:ResolvableProperties).and_return([])
 
       expect(Yast::Report).not_to receive(:Error)