From 4311412b44054b336a4df6a7e38184f2c9e5b8f5 Mon Sep 17 00:00:00 2001 From: James Laska Date: Mon, 24 Jun 2013 12:54:35 -0400 Subject: [PATCH] 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. --- library/packaging/rhn_register | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/packaging/rhn_register b/library/packaging/rhn_register index 0e391a4266..1a64041a59 100644 --- a/library/packaging/rhn_register +++ b/library/packaging/rhn_register @@ -158,15 +158,15 @@ class RegistrationBase (object): class Rhn(RegistrationBase): - def __init__(self, username=None, password=None, filename=None): + def __init__(self, username=None, password=None): 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 ''' - 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 # configuration. Yeah, I know this should be subclassed ... but, oh