Commit 6304b7e7 by Michael DeHaan

Merge pull request #3332 from jlaska/rhn_register_cfgfile_fix

rhn_register - Correctly load up2date configuration
parents f42e3bf0 4311412b
...@@ -158,15 +158,15 @@ class RegistrationBase (object): ...@@ -158,15 +158,15 @@ class RegistrationBase (object):
class Rhn(RegistrationBase): class Rhn(RegistrationBase):
def __init__(self, username=None, password=None, filename=None): def __init__(self, username=None, password=None):
RegistrationBase.__init__(self, username, password) RegistrationBase.__init__(self, username, password)
self.config = self._read_config(filename) self.config = self.load_config()
def _read_config(self, filename=None): def load_config(self):
''' '''
Read configuration from /etc/sysconfig/rhn/up2date Read configuration from /etc/sysconfig/rhn/up2date
''' '''
self.config = up2date_client.config.initUp2dateConfig(filename) self.config = up2date_client.config.initUp2dateConfig()
# Add support for specifying a default value w/o having to standup some # Add support for specifying a default value w/o having to standup some
# configuration. Yeah, I know this should be subclassed ... but, oh # configuration. Yeah, I know this should be subclassed ... but, oh
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment