Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory checked
in at 2022-10-15 16:35:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2 (Old)
and /work/SRC/openSUSE:Factory/.yast2.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2"
Sat Oct 15 16:35:02 2022 rev:542 rq:1010964 version:4.5.17
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2022-10-10
18:43:54.602784388 +0200
+++ /work/SRC/openSUSE:Factory/.yast2.new.2275/yast2.changes 2022-10-15
16:36:23.630000059 +0200
@@ -1,0 +2,6 @@
+Fri Oct 14 14:54:58 UTC 2022 - Steffen Winterfeldt <snw...@suse.com>
+
+- remove #postprocess_url from RelURL class (jsc#SLE-22578, jsc#SLE-24584)
+- 4.5.17
+
+-------------------------------------------------------------------
Old:
----
yast2-4.5.16.tar.bz2
New:
----
yast2-4.5.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.y7zIUK/_old 2022-10-15 16:36:24.326001731 +0200
+++ /var/tmp/diff_new_pack.y7zIUK/_new 2022-10-15 16:36:24.334001750 +0200
@@ -17,7 +17,7 @@
Name: yast2
-Version: 4.5.16
+Version: 4.5.17
Release: 0
Summary: YaST2 Main Package
++++++ yast2-4.5.16.tar.bz2 -> yast2-4.5.17.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-4.5.16/library/general/src/lib/yast2/rel_url.rb
new/yast2-4.5.17/library/general/src/lib/yast2/rel_url.rb
--- old/yast2-4.5.16/library/general/src/lib/yast2/rel_url.rb 2022-10-07
11:03:03.000000000 +0200
+++ new/yast2-4.5.17/library/general/src/lib/yast2/rel_url.rb 2022-10-14
17:31:35.000000000 +0200
@@ -104,7 +104,6 @@
ret.path = absolute_path
end
- postprocess_url(ret)
ret
end
@@ -119,17 +118,5 @@
url.path = File.join("/", url.host, url.path)
url.host = nil
end
-
- # a reverse method to "preprocess_url", fix the URL if it is a "file://"
URL
- def postprocess_url(url)
- return if url.scheme != "file" && !url.host.nil? && !url.host.empty?
-
- path = url.path.sub(/\A\/+/, "").split("/")
- url.host = path.shift
-
- rest = File.join(path)
- rest.prepend("/") unless rest.empty?
- url.path = rest
- end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-4.5.16/library/general/test/yast2/rel_url_test.rb
new/yast2-4.5.17/library/general/test/yast2/rel_url_test.rb
--- old/yast2-4.5.16/library/general/test/yast2/rel_url_test.rb 2022-10-07
11:03:03.000000000 +0200
+++ new/yast2-4.5.17/library/general/test/yast2/rel_url_test.rb 2022-10-14
17:31:35.000000000 +0200
@@ -64,7 +64,22 @@
it "returns the relative URL if the base URL is empty" do
relurl = Yast2::RelURL.new("", "relurl://test")
- expect(relurl.absolute_url.to_s).to eq("relurl://test")
+ expect(relurl.absolute_url.to_s).to eq("relurl:/test")
+ end
+
+ it "relurl can have 1 slash (relurl:/)" do
+ relurl = Yast2::RelURL.new("", "relurl:/test")
+ expect(relurl.absolute_url.to_s).to eq("relurl:/test")
+ end
+
+ it "relurl can have 2 slashes (relurl://)" do
+ relurl = Yast2::RelURL.new("", "relurl://test")
+ expect(relurl.absolute_url.to_s).to eq("relurl:/test")
+ end
+
+ it "relurl can have 3 slashes (relurl:///)" do
+ relurl = Yast2::RelURL.new("", "relurl:///test")
+ expect(relurl.absolute_url.to_s).to eq("relurl:/test")
end
it "returns empty URL if both relative and base URLs are empty" do
@@ -179,9 +194,14 @@
expect(relurl.absolute_url.to_s).to eq("ftp://example.com/test";)
end
- it "works with cd:// URL" do
- relurl = Yast2::RelURL.new("cd://", "relurl://test")
- expect(relurl.absolute_url.to_s).to eq("cd://test")
+ it "works with cd:/ URL" do
+ relurl = Yast2::RelURL.new("cd:/", "relurl://test")
+ expect(relurl.absolute_url.to_s).to eq("cd:/test")
+ end
+
+ it "corrects cd:// URL to cd:/" do
+ relurl = Yast2::RelURL.new("cd:/", "relurl://test")
+ expect(relurl.absolute_url.to_s).to eq("cd:/test")
end
it "works with cifs:// URL" do
@@ -194,19 +214,24 @@
expect(relurl.absolute_url.to_s).to eq("nfs://server/export/path/test")
end
- it "works with file:// base URL" do
+ it "works with file:/ base URL" do
+ relurl = Yast2::RelURL.new("file:/foo/bar", "relurl://test")
+ expect(relurl.absolute_url.to_s).to eq("file:///foo/bar/test")
+ end
+
+ it "corrects file:// base URL to file:///" do
relurl = Yast2::RelURL.new("file://foo/bar", "relurl://test")
- expect(relurl.absolute_url.to_s).to eq("file://foo/bar/test")
+ expect(relurl.absolute_url.to_s).to eq("file:///foo/bar/test")
end
it "works with file:/// base URL" do
relurl = Yast2::RelURL.new("file:///", "relurl://test")
- expect(relurl.absolute_url.to_s).to eq("file://test")
+ expect(relurl.absolute_url.to_s).to eq("file:///test")
end
- it "goes up with file:// base URL properly" do
- relurl = Yast2::RelURL.new("file://foo/bar", "relurl://../../test")
- expect(relurl.absolute_url.to_s).to eq("file://test")
+ it "follows '..' with file:/ base URL properly" do
+ relurl = Yast2::RelURL.new("file:/foo/bar", "relurl://../../test")
+ expect(relurl.absolute_url.to_s).to eq("file:///test")
end
it "adds the requested path to the absolute URL" do
@@ -229,7 +254,7 @@
# might not be exactly what you would expect as the result but this is a
corner
# case, do not overengineer the code, the most important fact is that it
does
# not crash and the result is a valid file path
- expect(relurl.absolute_url("foo/bar").to_s).to eq("//foo/bar")
+ expect(relurl.absolute_url("foo/bar").to_s).to eq("/foo/bar")
end
end
@@ -238,7 +263,7 @@
allow(Yast::InstURL).to receive(:installInf2Url).and_return(inst_url)
end
- let(:rel_url) { "relurl://test" }
+ let(:rel_url) { "relurl:/test" }
subject { Yast2::RelURL.from_installation_repository(rel_url) }
context "during installation" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.5.16/package/yast2.changes
new/yast2-4.5.17/package/yast2.changes
--- old/yast2-4.5.16/package/yast2.changes 2022-10-07 11:03:03.000000000
+0200
+++ new/yast2-4.5.17/package/yast2.changes 2022-10-14 17:31:35.000000000
+0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Oct 14 14:54:58 UTC 2022 - Steffen Winterfeldt <snw...@suse.com>
+
+- remove #postprocess_url from RelURL class (jsc#SLE-22578, jsc#SLE-24584)
+- 4.5.17
+
+-------------------------------------------------------------------
Thu Oct 6 13:48:28 UTC 2022 - Josef Reidinger <jreidin...@suse.com>
- add Yast::ReducedRecorder for Cheetah to filter out certain streams to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.5.16/package/yast2.spec
new/yast2-4.5.17/package/yast2.spec
--- old/yast2-4.5.16/package/yast2.spec 2022-10-07 11:03:03.000000000 +0200
+++ new/yast2-4.5.17/package/yast2.spec 2022-10-14 17:31:35.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2
-Version: 4.5.16
+Version: 4.5.17
Release: 0
Summary: YaST2 Main Package
