java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysCommand.java | 5
+++++
1 file changed, 5 insertions(+)
New commits:
commit 624f3267af6ab45f84753d1c4e5461ea19b0fc6d
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Mar 31 11:29:56 2010 -0400
531122 - fixing issue where system records created with cobbler would not use all the
correct activation keys once keys were changed from a profile
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysCommand.java
index f632a2f..d9154f5 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysCommand.java
@@ -79,8 +79,13 @@ public class KickstartActivationKeysCommand extends
BaseKickstartCommand {
for (Long id : ids) {
Token token = TokenFactory.lookupById(id);
this.getKickstartData().addDefaultRegToken(token);
+ }
+ //So we will add them all even if they are already there (in case the
+ // Key was added via the commandline and doesn't actually have them :/
+ for (Token token : this.getKickstartData().getDefaultRegTokens()) {
keysToAdd.add(ActivationKeyFactory.lookupByToken(token).getKey());
}
+
Profile prof = Profile.lookupById(
CobblerXMLRPCHelper.getConnection(this.getUser()),
this.getKickstartData().getCobblerId());
Show replies by date