backend/server/handlers/config/rhn_config_management.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 46830082e095a9273ef2e5fe6fcd3a91eb14a952
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Tue Jul 12 21:09:56 2011 -0300
633400 - rhncfg-client lists lower-ranked config channel for file
diff --git a/backend/server/handlers/config/rhn_config_management.py
b/backend/server/handlers/config/rhn_config_management.py
index f35b3e4..273cefd 100644
--- a/backend/server/handlers/config/rhn_config_management.py
+++ b/backend/server/handlers/config/rhn_config_management.py
@@ -144,7 +144,12 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
break
path = row['path']
- result_hash[path] = (config_channel, path,
row['config_file_type_id'])
+
+ if not path in result_hash:
+ result_hash[path] = (config_channel, path,
row['config_file_type_id'])
+
+ if config_channel == str(self.server.getid()):
+ result_hash[path] = (config_channel, path,
row['config_file_type_id'])
result = result_hash.values()
# Sort by path first since that's what the web site does
Show replies by date