Merge pull request #44 from yast/merge_SLE-15-SP2

Replace novell urls by SUSE ones in SLE-15-SP3
yast · Jun 9, 2021 · 378b54c · 378b54c
2 parents 307109b + a2523e4
commit 378b54c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/package/yast2-proxy.changes b/package/yast2-proxy.changes
@@ -4,6 +4,7 @@ Wed Jun  9 08:04:48 UTC 2021 - Knut Anderssen <kanderssen@suse.com>
 - Added 'to_target' variable which will determine whether the
   configuration should be written to the target system at the end
   of the installation or not (bsc#1185016).
+- Replace novell urls by SUSE ones (bsc#1100366)
 - 4.3.3
 
 -------------------------------------------------------------------

diff --git a/src/modules/Proxy.rb b/src/modules/Proxy.rb
@@ -273,8 +273,8 @@ def RunTestProxy(http_proxy, https_proxy, ftp_proxy, proxy_user, proxy_password)
       # /usr/bin/curl --verbose
       # --proxy http://server_name:port_number
       # --proxy-user user:password
-      # --url http://www.novell.com or ftp://ftp.novell.com | suggested for HTTP or FTP test
-      # --url https://secure-www.novell.com --insecure
+      # --url http://www.suse.com or ftp://ftp.suse.com | suggested for HTTP or FTP test
+      # --url https://www.suse.com --insecure
       ret = {}
 
       test_http = (http_proxy != "" && http_proxy != "http://") ? true : false
@@ -298,22 +298,22 @@ def RunTestProxy(http_proxy, https_proxy, ftp_proxy, proxy_user, proxy_password)
         http_proxy.shellescape,
         user_pass,
         timeout_sec,
-        "http://www.novell.com"
+        "http://www.suse.com"
       )
       # adding option --insecure to accept the certificate without asking
       https_command = Builtins.sformat(
         command,
         https_proxy.shellescape,
         user_pass,
         timeout_sec,
-        "https://secure-www.novell.com --insecure"
+        "https://www.suse.com --insecure"
       )
       ftp_command = Builtins.sformat(
         command,
         ftp_proxy.shellescape,
         user_pass,
         timeout_sec,
-        "ftp://ftp.novell.com"
+        "ftp://ftp.suse.com"
       )
 
       Builtins.y2milestone("Running HTTP_PROXY test...")