java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java |
2 ++
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java |
8 ++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit f8559ee73b52ba4959828459b8c68ed10ef27b2e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Dec 3 14:20:49 2012 +0100
881830 - create /var/lib/rhn/kickstarts/wizard/*.cfg files if missing by the
KickstartFileSyncTask
also fix the query returning all kickstart data to contain only unique entries
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index 41171d5..3a82dc2 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -879,6 +879,8 @@ public class KickstartFactory extends HibernateFactory {
public static List<KickstartData> listAllKickstartData() {
Session session = getSession();
Criteria c = session.createCriteria(KickstartData.class);
+ // Hibernate does not filter out duplicate references by default
+ c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
return c.list();
}
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java
index 9ebd6aa..1310fc0 100644
---
a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java
+++
b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java
@@ -22,6 +22,8 @@ import com.redhat.rhn.domain.user.User;
import org.apache.commons.lang.StringUtils;
import org.cobbler.Profile;
+import java.io.File;
+
/**
* KickstartCobblerCommand - class to contain logic to communicate with cobbler
* @version $Rev$
@@ -59,8 +61,10 @@ public class CobblerProfileEditCommand extends CobblerProfileCommand {
if (prof != null) {
String cobName = makeCobblerName(ksData);
+ String cobFileName = ksData.buildCobblerFileName();
if (!cobName.equals(prof.getName()) ||
- !ksData.buildCobblerFileName().equals(ksData.getCobblerFileName()))
{
+ !cobFileName.equals(ksData.getCobblerFileName()) ||
+ !(new File(cobFileName)).exists()) {
// delete current cfg file
KickstartFactory.removeKickstartTemplatePath(ksData);
// create new cfg file
@@ -68,7 +72,7 @@ public class CobblerProfileEditCommand extends CobblerProfileCommand {
// change ks profile name
prof.setName(cobName);
// change ks profile cfg path
- prof.setKickstart(this.ksData.buildCobblerFileName());
+ prof.setKickstart(cobFileName);
}
updateCobblerFields(prof);
}
Show replies by date