[PATCH] Only override proxy and noverifyssl if specified (#880482)

Brian C. Lane bcl at redhat.com
Fri May 3 23:16:49 UTC 2013


From: "Brian C. Lane" <bcl at redhat.com>

They were always getting overridden by the default cmdline values
instead of only being overridden if passed on the cmdline.
---
 anaconda | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/anaconda b/anaconda
index 6076262..da12a04 100755
--- a/anaconda
+++ b/anaconda
@@ -907,8 +907,10 @@ if __name__ == "__main__":
     kickstart.appendPostScripts(ksdata)
 
     # cmdline flags override kickstart settings
-    ksdata.method.proxy = anaconda.proxy
-    ksdata.method.noverifyssl = flags.noverifyssl
+    if anaconda.proxy:
+        ksdata.method.proxy = anaconda.proxy
+    if flags.noverifyssl:
+        ksdata.method.noverifyssl = flags.noverifyssl
 
     # set ksdata.method based on anaconda.method if it isn't already set
     if anaconda.methodstr and not ksdata.method.method:
-- 
1.8.1.4



More information about the anaconda-patches mailing list