Joey Boggs has uploaded a new change for review. Change subject: rhn: correctly show satellite checkbox when registered ......................................................................
rhn: correctly show satellite checkbox when registered rhbz#887743 Change-Id: I8ab09c45910e080a290d144a375d738cf22fe43a Signed-off-by: Joey Boggs <[email protected]> --- M scripts/rhn.py 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/97/10597/1 diff --git a/scripts/rhn.py b/scripts/rhn.py index 55ae23b..1bf3659 100755 --- a/scripts/rhn.py +++ b/scripts/rhn.py @@ -28,7 +28,7 @@ RHN_CONFIG_FILE = "/etc/sysconfig/rhn/up2date" RHSM_CONFIG_FILE = "/etc/rhsm/rhsm.conf" - +RHN_XMLRPC_ADDR = "https://xmlrpc.rhn.redhat.com/XMLRPC"; def run_rhnreg(serverurl="", cacert="", activationkey="", username="", password="", profilename="", proxyhost="", proxyuser="", @@ -528,8 +528,10 @@ pass self.rhn_actkey = Entry(40, "") if rhn_check(): - if self.rhn_url.value() == "https://xmlrpc.rhn.redhat.com/XMLRPC"; \ - or len(self.rhn_url.value()) == 0: + if self.rhn_url.value() == RHN_XMLRPC_ADDR or \ + len(self.rhn_url.value()) == 0 and \ + RHN_XMLRPC_ADDR in \ + self.rhn_conf["serverURL"]: self.public_rhn.setValue("*") self.rhn_url.setFlags(_snack.FLAG_DISABLED, _snack.FLAGS_SET) self.rhn_ca.setFlags(_snack.FLAG_DISABLED, _snack.FLAGS_SET) -- To view, visit http://gerrit.ovirt.org/10597 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ab09c45910e080a290d144a375d738cf22fe43a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Joey Boggs <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
