Permalink
Browse files

Fix interpretation of unset PROXY_ENABLED in ProxyClass#Read (boo#934…

…925).

to match /etc/profile.d/profile.sh : unset means disabled
but YaST interpreted it as enabled.
  • Loading branch information...
mvidner committed Jun 12, 2015
1 parent f790db5 commit 9d6cf8f7644e3d751092fe810c2a24ef3186ddc0
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/modules/Proxy.rb
  2. +1 −1 test/read_test.rb
View
@@ -75,7 +75,7 @@ def Read
@no = "" if @no == nil
@enabled = Convert.to_string(
SCR.Read(path(".sysconfig.proxy.PROXY_ENABLED"))
) != "no"
) == "yes"
# Read /root/.curlrc
if Ops.greater_than(SCR.Read(path(".target.size"), "/root/.curlrc"), 0)
View
@@ -29,7 +29,7 @@
expect(Yast::SCR).to receive(:Read).
with(path(".sysconfig.proxy.PROXY_ENABLED")).
and_return nil
and_return "yes"
expect(Yast::SCR).to receive(:Read).
with(path(".target.size"), "/root/.curlrc").

0 comments on commit 9d6cf8f

Please sign in to comment.