client/tools/rhncfg/actions/configfiles.py | 9 ++++++---
client/tools/rhncfg/rhncfg.spec | 6 +++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 3c02571f25ba79ae9d04674aa2f2e42f1ee8d727
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Aug 12 15:59:23 2011 +0200
Automatic commit of package [rhncfg] release [5.10.13-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index d56f53e..5c1a213 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.12
+Version: 5.10.13
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -106,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Aug 12 2011 Miroslav Suchý 5.10.13-1
+- add proto, server_name and server_list to local_config overrides
+- None has not iteritems() method
+
* Thu Aug 11 2011 Miroslav Suchý 5.10.12-1
- True and False constants are defined since python 2.4
- do not mask original error by raise in execption
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 4690d30..b44dcb7 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.12-1 client/tools/rhncfg/
+5.10.13-1 client/tools/rhncfg/
commit 3ae3db25bf808c01fd4655e68a1a8a81137086f0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Aug 12 11:43:51 2011 +0200
add proto, server_name and server_list to local_config overrides
this was forgotten in commit:
1a95582f4079fb92566daf491bd2c542f00865b6
addressing:
[Thu Jul 28 13:25:02 2011] up2date
Traceback (most recent call last):
File "/usr/sbin/rhn_check", line 333, in __run_action
(status, message, data) = CheckCli.__do_call(method, params, kwargs)
File "/usr/sbin/rhn_check", line 326, in __do_call
retval = method(*params, **kwargs)
File "/usr/share/rhn/actions/configfiles.py", line 189, in upload
r = rpc_cli_repository.ClientRepository()
File "/usr/share/rhn/config_client/rpc_cli_repository.py", line 32, in
__init__
repository.RPC_Repository.__init__(self, setup_network)
File "/usr/share/rhn/config_common/repository.py", line 223, in __init__
self.__server_url = self._local_config.get('server_url')
File "/usr/share/rhn/config_common/local_config.py", line 105, in get
return _get_config().get_option(var)
File "/usr/share/rhn/config_common/local_config.py", line 72, in get_option
ret = self.get(self.section, option, vars=self.overrides)
File "/usr/lib/python2.4/ConfigParser.py", line 525, in get
return self._interpolate(section, option, value, d)
File "/usr/lib/python2.4/ConfigParser.py", line 570, in _interpolate
raise InterpolationMissingOptionError(
ConfigParser.InterpolationMissingOptionError: Bad value substitution:
section: [rhncfg-client]
option : server_url
key : server_name
rawval : https://%(server_name)s%(server_handler)s
diff --git a/client/tools/rhncfg/actions/configfiles.py
b/client/tools/rhncfg/actions/configfiles.py
index 0b0d6c0..9ccb978 100755
--- a/client/tools/rhncfg/actions/configfiles.py
+++ b/client/tools/rhncfg/actions/configfiles.py
@@ -409,8 +409,11 @@ def create_key_list():
def _init():
cfg = config.initUp2dateConfig()
- local_config.init('rhncfg-client', defaults=dict(cfg.items()))
+ cfg_dict = dict(cfg.items())
+ server_url = config.getServerlURL()
+ cfg_dict['proto'], cfg_dict['server_name'] =
utils.parse_url(server_url[0], scheme="https")[:2]
+ if len(server_url) > 1:
+ cfg_dict['server_list'] = server_url
+ local_config.init('rhncfg-client', defaults=cfg_dict)
set_debug_level(int(local_config.get('debug_level') or 0))
set_logfile("/var/log/rhncfg-actions")
-
-