java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java | 10
+++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit de23b16f7ca113515c691ab285053c3a86aebdd0
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Oct 27 12:19:31 2009 -0400
531059 - fixing issue where certain characters in the org name would cause errors when
trying to create things in cobbler
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
index bcd243e..44818b5 100755
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java
@@ -123,12 +123,16 @@ public abstract class CobblerCommand {
* @return the cobbler name.
*/
public static String makeCobblerName(String label, Org org) {
+ label = label.replaceAll("[^a-zA-Z0-9]", "").replace('
', '_');
+
if (org == null) {
- return label.replace(' ', '-');
+ return label;
}
+
+ String orgName = org.getName().replaceAll("[^a-zA-Z0-9]",
"").replace(' ', '_');
String format = "%s:%s:%s";
- return String.format(format, label.replace(' ', '-'),
org.getId(),
- org.getName().replace(' ', '-'));
+ return String.format(format, label, org.getId(), orgName);
+
}
/**
Show replies by date