Hello,

We had an issue reported on satellite (BZ#902787). From User Interface file 
comparison is not working as expected.
It always displays message "Differences exist in a file that is not readable by 
all. Re-deployment of configuration file is recommended". 

>From CLI using "rhncfg-client diff" it displays expected output.
Using CLI it creates source file as a temp file and from WEB-UI this is exactly 
opposite, it creates destination file as a temp file. 

After troubleshooting we can see that issue is here in 
/usr/share/rhn/config_common/file_utils.py -

 result = ''.join(diff(path, temp_file))


Its a regression bug. This issue is linked to a BZ#869626.
Attached the proposed patch to correct functionality. Please share your 
feedback on this.

Regards,
Neha
From aa7a5211722f0b7474297e187d76bc86c6870ae0 Mon Sep 17 00:00:00 2001
From: Neha Rawat <nera...@nerawat.csb>
Date: Wed, 23 Jan 2013 19:44:30 +0530
Subject: [PATCH] Signed-off-by: Neha Rawat <nera...@nerawat.csb>

902787 - correction in diff functionality using GUI
---
 client/tools/rhncfg/config_common/file_utils.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/client/tools/rhncfg/config_common/file_utils.py b/client/tools/rhncfg/config_common/file_utils.py
index 30dcce3..819c3e8 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -128,7 +128,7 @@ class FileProcessor:
                 else:
                     raise e
         else:
-            result = ''.join(diff(path, temp_file))
+            result = ''.join(diff(temp_file, path))
 
         os.unlink(temp_file)
         return sectx_result + result
-- 
1.7.1

_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel

Reply via email to