Merge pull request #695 from yast/merge_SLE-12-SP2

Merge branch 'SLE-12-SP2' into SLE-12-SP3
yast · Feb 15, 2018 · 6823897 · 6823897
2 parents 7140a3e + 577a64b
commit 6823897
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/library/types/src/modules/URL.rb b/library/types/src/modules/URL.rb
@@ -655,9 +655,10 @@ def HidePasswordToken(tokens)
 
   private
 
-    # Schemes which should not include a host.
+    # Schemes which should not include a host.Should be kept in sync with libzypp.
+    # @see https://github.com/openSUSE/libzypp/blob/d9c97b883ac1561225c4d728a5f6c8a34498d5b9/zypp/Url.cc#L184-L190
     # @see #merge_host_and_path
-    SCHEMES_WO_HOST = ["cd", "dvd"].freeze
+    SCHEMES_WO_HOST = ["cd", "dvd", "hd", "iso", "dir"].freeze
 
     # Merges host and path tokens
     #

diff --git a/library/types/test/url_test.rb b/library/types/test/url_test.rb
@@ -288,7 +288,12 @@
       "http://user:password@[2001:de8:0:f123::1]:8080/path/to/dir"                               => "http://user:password@[2001:de8:0:f123::1]:8080/path/to/dir",
       "http://name:pass@www.suse.cz:80/path/index.html?question#part"                            => "http://name:pass@www.suse.cz:80/path/index.html?question#part",
       "smb://username:passwd@servername/share/path/on/the/share?mountoptions=ro&workgroup=group" => "smb://username:passwd@servername/share/path/on/the/share?mountoptions=ro&workgroup=group",
-      "slp:/"                                                                                    => "slp://"
+      "slp:/"                                                                                    => "slp://",
+      "dir:/"                                                                                    => "dir:///",
+      "iso:/"                                                                                    => "iso:///",
+      "hd:/"                                                                                     => "hd:///",
+      "cd:/"                                                                                     => "cd:///",
+      "dvd:/"                                                                                    => "dvd:///"
     }.freeze
 
     URLS.each do |url, rebuilt|

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Tue Feb 13 09:34:40 UTC 2018 - lslezak@suse.cz
+
+- Fixed list of the URL schemes without host, fixes processing
+  URLs with the "hd:/" scheme (bsc#1077310)
+- 3.2.43
+
+-------------------------------------------------------------------
+
 Mon Jan 15 16:35:08 UTC 2018 - jreidinger@suse.com
 
 - fix starting gnome control center (bsc#1058376 and bsc#1075535)

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