backend/satellite_tools/satsync.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 93d3696df45e3267e00db4bdf23d0a8dec0e6ac2
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Wed Jul 1 13:02:50 2009 -0400
509181 - The config cert defaults to hosted if specified instead of master. This fix
should override the hosted options when using iss settings
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 4504517..cc39ac6 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -2129,7 +2129,8 @@ def processCommandline():
CFG.set("ISS_PARENT", None)
else:
CFG.set("ISS_PARENT", OPTIONS.iss_parent or CFG.ISS_PARENT)
- CFG.set("ISS_CA_CHAIN", OPTIONS.ca_cert or CFG.CA_CHAIN)
+ CFG.set("ISS_CA_CHAIN", OPTIONS.ca_cert or CFG.ISS_CA_CHAIN or
CFG.CA_CHAIN)
+
CFG.set("HTTP_PROXY", OPTIONS.http_proxy or CFG.HTTP_PROXY)
CFG.set("HTTP_PROXY_USERNAME", OPTIONS.http_proxy_username or
CFG.HTTP_PROXY_USERNAME)
CFG.set("HTTP_PROXY_PASSWORD", OPTIONS.http_proxy_password or
CFG.HTTP_PROXY_PASSWORD)
Show replies by date