java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java |
6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 6d89779cf6bdc69a8480e39efe7fd58624b3558a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 25 10:50:28 2011 +0200
726114 - allow macro delimiters in configchannel.createOrUpdatePath for directories
to behave according to the documentation: (ignored if working with a directory)
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
index d4ddae9..4a388eb 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
@@ -382,10 +382,8 @@ public class ConfigChannelHandler extends BaseHandler {
validKeys.add(ConfigRevisionSerializer.PERMISSIONS);
validKeys.add(ConfigRevisionSerializer.REVISION);
validKeys.add(ConfigRevisionSerializer.SELINUX_CTX);
- if (!isDir) {
- validKeys.add(ConfigRevisionSerializer.MACRO_START);
- validKeys.add(ConfigRevisionSerializer.MACRO_END);
- }
+ validKeys.add(ConfigRevisionSerializer.MACRO_START);
+ validKeys.add(ConfigRevisionSerializer.MACRO_END);
validateMap(validKeys, data);
if (data.get(ConfigRevisionSerializer.SELINUX_CTX) == null) {
Show replies by date