Merge pull request #217 from yast/proxy

Proxy
yast · Jul 17, 2014 · 941e674 · 941e674
2 parents 1147982 + e2ab19a
commit 941e674
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 17 11:07:46 CEST 2014 - snwint@suse.de
+
+- Use ProxyURL when reading proxy settings from install.inf.
+- 3.1.70
+
 -------------------------------------------------------------------
 Mon Jul 14 10:32:34 CEST 2014 - schubi@suse.de
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.69
+Version:        3.1.70
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/network/install_inf_convertor.rb b/src/lib/network/install_inf_convertor.rb
@@ -240,10 +240,12 @@ def write_dns
     end
 
     def write_proxy
-      proxyUrl = InstallInf["ProxyUrl"].to_s
-      proxyProto = InstallInf["ProxyProto"].to_s
+      # ProxyURL format: scheme://user:password@server:port
+      proxyUrl = InstallInf["ProxyURL"].to_s
 
-      return false if proxyProto.empty? || proxyUrl.empty?
+      return false if proxyUrl.empty?
+
+      proxyProto = proxyUrl.sub(/:.*/, "")
 
       log.info("Writing proxy settings: #{proxyProto}_proxy = '#{proxyUrl}'")