Correctly load up2date configuration

Previously, a configuration file name of None was being passed into
up2dateInitConfig().  This resulted in a correct configuration import,
but failed to properly save the configuration back to disk in the event
a different serverURL was supplied.  This change removes support for
customizing the up2date filename entirely, and relies on up2date to
choose the default config filename.
This commit is contained in:
James Laska 2013-06-24 12:54:35 -04:00
parent f42e3bf010
commit 4311412b44

View file

@ -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