java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ffa324a00da32cb747df0fedd215fb8f32cc295c
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jan 27 16:34:51 2010 -0500
559284 - fixing issue where _ & - characters were being removed from cobbler
names
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 44818b5..27f603c 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,13 +123,13 @@ public abstract class CobblerCommand {
* @return the cobbler name.
*/
public static String makeCobblerName(String label, Org org) {
- label = label.replaceAll("[^a-zA-Z0-9]", "").replace('
', '_');
+ label = label.replace(' ',
'_').replaceAll("[^a-zA-Z0-9_-]", "");
if (org == null) {
return label;
}
- String orgName = org.getName().replaceAll("[^a-zA-Z0-9]",
"").replace(' ', '_');
+ String orgName = org.getName().replaceAll("[^a-zA-Z0-9_-]",
"").replace(' ', '_');
String format = "%s:%s:%s";
return String.format(format, label, org.getId(), orgName);
Show replies by date