Merge 9938998 into cc403e5

yast · Feb 18, 2019 · 1529f0d · 1529f0d
2 parents cc403e5 + 9938998
commit 1529f0d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/library/commandline/test/commandline_test.rb b/library/commandline/test/commandline_test.rb
@@ -15,6 +15,10 @@
     Yast::Mode.SetUI(orig_ui)
   end
 
+  before do
+    allow(Yast::Debugger).to receive(:installed?).and_return(false)
+  end
+
   it "invokes initialize, handler and finish" do
     expect(STDOUT).to receive(:puts).with("Initialize called").ordered
     expect(STDOUT).to receive(:puts).with("something").ordered

diff --git a/library/network/test/firewalld_wrapper_test.rb b/library/network/test/firewalld_wrapper_test.rb
@@ -15,6 +15,7 @@
     allow(subject).to receive(:firewalld).and_return(firewalld)
     allow(firewalld).to receive(:zones).and_return(zones)
     allow(firewalld).to receive(:installed?).and_return(true)
+    allow(Yast::NetworkInterfaces).to receive(:List).with("").and_return([])
     external.interfaces = ["eth0"]
     external.services = ["dhcp"]
   end

diff --git a/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb b/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb
@@ -174,9 +174,15 @@ def release_notes_file(directory, prefs)
         langs << prefs.user_lang.split("_", 2).first if prefs.user_lang.include?("_")
         langs << prefs.fallback_lang
 
-        path = Dir.glob(
-          File.join(directory, "**", "RELEASE-NOTES.{#{langs.join(",")}}.#{prefs.format}")
-        ).first
+        path = nil
+        langs.any? do |lang|
+          path = Dir.glob(
+            File.join(directory, "**", "RELEASE-NOTES.#{lang}.#{prefs.format}")
+          ).first
+
+          !path.nil?
+        end
+
         return nil if path.nil?
         [path, path[/RELEASE-NOTES\.(.+)\.#{prefs.format}\z/, 1]] if path
       end

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 18 07:47:37 UTC 2019 - lslezak@suse.cz
+
+- Fixed license file ordering issue causing a random test failure
+  (gh#yast-yast2#895)
+- 4.1.55
+
 -------------------------------------------------------------------
 Thu Feb  7 10:01:59 UTC 2019 - knut.anderssen@suse.com
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.1.54
+Version:        4.1.55
 Release:        0
 Summary:        YaST2 - Main Package
 License:        GPL-2.0-only