client/tools/rhncfg/config_common/Makefile | 2 -
client/tools/rhncfg/config_common/rhn_main.py | 5 +++-
client/tools/rhncfg/config_common/rhn_rpc.py | 26 -----------------------
client/tools/rhncfg/config_common/rpc_wrapper.py | 2 -
client/tools/rhncfg/rhncfg.spec | 6 ++++-
rel-eng/packages/rhncfg | 2 -
6 files changed, 12 insertions(+), 31 deletions(-)
New commits:
commit 7d24516b55c49967f231182af7620219af6d118b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Aug 1 14:37:14 2011 +0200
Automatic commit of package [rhncfg] release [5.10.10-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index b632568..31c942d 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.9
+Version: 5.10.10
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
+* Mon Aug 01 2011 Miroslav Suchý 5.10.10-1
+- get server_name from config only if it was not set on command line
+- remove rhn_rpc.py
+
* Fri Jul 15 2011 Miroslav Suchý 5.10.9-1
- optparse is here since python 2.3 - remove optik (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 330a4a1..00ba391 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.9-1 client/tools/rhncfg/
+5.10.10-1 client/tools/rhncfg/
commit ade5bad7b02032d32f8e62f4c16dbc6c86f670e0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Aug 1 12:06:05 2011 +0200
get server_name from config only if it was not set on command line
diff --git a/client/tools/rhncfg/config_common/rhn_main.py
b/client/tools/rhncfg/config_common/rhn_main.py
index bf3edd5..f500e46 100644
--- a/client/tools/rhncfg/config_common/rhn_main.py
+++ b/client/tools/rhncfg/config_common/rhn_main.py
@@ -131,7 +131,10 @@ class BaseMain:
cfg = config.initUp2dateConfig()
up2date_cfg = dict(cfg.items())
- server_name = config.getServerlURL()
+ if server_name:
+ server_name = [server_name]
+ else:
+ server_name = config.getServerlURL()
up2date_cfg['proto'] = urlsplit(server_name[0])[0]
up2date_cfg['server_list'] = map(lambda x: urlsplit(x)[1], server_name)
if server_name:
commit 615ecea82bb815467ecce7b6383b1659b439ebd5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Aug 1 11:59:52 2011 +0200
remove rhn_rpc.py
addressing:
Traceback (most recent call last):
File "/usr/bin/rhncfg-manager", line 46, in ?
sys.exit(Main().main() or 0)
File "/usr/share/rhn/config_common/rhn_main.py", line 167, in main
repo = getattr(repo_module, self.repository_class_name)()
File "/usr/share/rhn/config_management/rpc_repository.py", line 27, in
__init__
repository.RPC_Repository.__init__(self, setup_network)
File "/usr/share/rhn/config_common/repository.py", line 296, in __init__
rpc_handler="/XMLRPC")
File "/usr/share/rhn/config_common/rpc_wrapper.py", line 88, in __init__
progressCallback=progressCallback)
TypeError: __init__() got an unexpected keyword argument 'username'
Using server name
hp-xw6600-01.rhts.eng.bos.redhat.com
Traceback (most recent call last):
File "/usr/bin/rhncfg-client", line 34, in ?
sys.exit(Main().main() or 0)
File "/usr/share/rhn/config_common/rhn_main.py", line 167, in main
repo = getattr(repo_module, self.repository_class_name)()
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 296, in __init__
rpc_handler="/XMLRPC")
File "/usr/share/rhn/config_common/rpc_wrapper.py", line 88, in __init__
progressCallback=progressCallback)
TypeError: __init__() got an unexpected keyword argument 'username'
diff --git a/client/tools/rhncfg/config_common/Makefile
b/client/tools/rhncfg/config_common/Makefile
index 8c9345e..f8ad18c 100644
--- a/client/tools/rhncfg/config_common/Makefile
+++ b/client/tools/rhncfg/config_common/Makefile
@@ -10,7 +10,7 @@ SUBDIR = config_common
FILES = __init__ cfg_exceptions \
file_utils deploy \
handler_base local_config \
- repository rhn_log rhn_main rhn_rpc \
+ repository rhn_log rhn_main \
utils transactions rpc_wrapper
diff --git a/client/tools/rhncfg/config_common/rhn_rpc.py
b/client/tools/rhncfg/config_common/rhn_rpc.py
deleted file mode 100644
index 4cecf00..0000000
--- a/client/tools/rhncfg/config_common/rhn_rpc.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2008--2010 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-"""
-This module exposes rpclib
-"""
-
-try:
- from rhn import rpclib
- from rhn import xmlrpclib
-except ImportError:
- import xmlrpclib
- rpclib = xmlrpclib
-
diff --git a/client/tools/rhncfg/config_common/rpc_wrapper.py
b/client/tools/rhncfg/config_common/rpc_wrapper.py
index 66e902f..07a9916 100644
--- a/client/tools/rhncfg/config_common/rpc_wrapper.py
+++ b/client/tools/rhncfg/config_common/rpc_wrapper.py
@@ -15,7 +15,7 @@
import sys
import string
-from rhn_rpc import rpclib
+from rhn import rpclib
import xmlrpclib
try:
from socket import error, sslerror, herror, gaierror, timeout