[Spacewalk-list] rhncfg-client in 1.2

[Michael Mraka]

John Hodrien wrote:
% Upgraded to the following (on the client):
% 
% rhncfg-5.9.44-1.el5.noarch.rpm
% rhncfg-actions-5.9.44-1.el5.noarch.rpm
% rhncfg-client-5.9.44-1.el5.noarch.rpm
% rhncfg-management-5.9.44-1.el5.noarch.rpm
% 
% Problem has returned.
% 
% # rhncfg-client diff
% 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 187, in main
%     handler.run()
%   File "/usr/share/rhn/config_client/handler_base.py", line 57, in run
%     (src, file_info, dirs_created) = self.repository.get_file_info(file)
%   File "/usr/share/rhn/config_client/rpc_cli_repository.py", line 82, in get_file_info
%     result['path'] = dest_directory + result['path']
% TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'
% 
% Commenting out line 82 is a functional workaround for now, which avoids joining
% the 'None' dest_directory to the path.

Ooops,

I'm sorry. Please apply diff below or wait for the package respin.

Thanks,

--
Michael Mráka
Satellite Engineering, Red Hat


diff -u /usr/share/rhn/config_client/rpc_cli_repository.py.orig /usr/share/rhn/config_client/rpc_cli_repository.py
--- /usr/share/rhn/config_client/rpc_cli_repository.py.orig
+++ /usr/share/rhn/config_client/rpc_cli_repository.py
@@ -79,7 +79,8 @@ class ClientRepository(repository.RPC_Repository):
         # Older servers will not return directories; if filetype is missing,
         # assume file
         if result.get('filetype') == 'directory':
-            result['path'] = dest_directory + result['path']
+            if dest_directory:
+                result['path'] = dest_directory + result['path']
             if os.path.isfile(result['path']):
                 raise cfg_exceptions.DirectoryEntryIsFile(result['path'])
             else: