Merge pull request #1232 from yast/merge_SLE-15-SP3

Merge SLE-15-SP3 into 'master'
yast · Jun 10, 2021 · d231347 · d231347
2 parents 0182e64 + 19d77bb
commit d231347
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun  8 08:44:23 UTC 2021 - Knut Anderssen <kanderssen@suse.com>
+
+- Use the linuxrc proxy settings for the HTTPS and FTP proxies
+  (bsc#1185016)
+- 4.4.15
+
 -------------------------------------------------------------------
 Fri Jun  4 09:08:43 UTC 2021 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        4.4.14
+Version:        4.4.15
 Release:        0
 Summary:        YaST2 - Network Configuration
 License:        GPL-2.0-only

diff --git a/src/lib/network/install_inf_convertor.rb b/src/lib/network/install_inf_convertor.rb
@@ -95,6 +95,11 @@ def write_proxy
       ex["proxy_password"] = proxy.password
       proxy.password = nil
       ex["#{proxyProto}_proxy"] = proxy.to_s
+      # Use the proxy also for https and ftp
+      if proxyProto == "http"
+        ex["https_proxy"] = proxy.to_s
+        ex["ftp_proxy"] = proxy.to_s
+      end
       ex["enabled"] = true
       log.info "Writing proxy settings: #{proxyProto}_proxy = '#{proxy}'"
       log.debug "Writing proxy settings: #{ex}"

diff --git a/test/install_inf_convertor_test.rb b/test/install_inf_convertor_test.rb
@@ -138,7 +138,8 @@
       )
       expect(Yast::Proxy).to receive(:Import) do |config|
         # proxy is enabled and the URL is set
-        expect(config).to include("enabled" => true, "http_proxy" => proxy_url)
+        expect(config).to include("enabled" => true, "http_proxy" => proxy_url,
+          "https_proxy" => proxy_url, "ftp_proxy" => proxy_url)
       end
       expect(Yast::Proxy).to receive(:Write).and_return(true)
 
@@ -162,6 +163,7 @@
       expect(Yast::Proxy).to receive(:Import) do |config|
         # proxy is enabled and the URL without credentials is set
         expect(config).to include("enabled" => true, "http_proxy" => proxy_url,
+          "https_proxy" => proxy_url, "ftp_proxy" => proxy_url,
           "proxy_user" => "user", "proxy_password" => "passwd")
       end
       expect(Yast::Proxy).to receive(:Write).and_return(true)