java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml |
8 ++++----
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java |
6 +++---
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java |
1 +
3 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit b51028197c9b82da3b9a959066462709ac1acaed
Author: Partha Aji <paji(a)redhat.com>
Date: Fri May 29 16:22:45 2009 -0400
502076 - Fixed kickstarting using a system profile
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml
index d911efa..fc3ffa5 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml
@@ -17,10 +17,10 @@ ORDER BY UPPER(SP.name)
<query params="prid">
SELECT PN.name || '-' || PE.evr.as_vre_simple() AS NVRE,
PA.label as arch
- FROM rhnServerProfilePackage SPP LEFT OUTER JOIN
- rhnPackageArch PA ON SPP.package_arch_id = PA.id INNER JOIN
- rhnPackageName PN ON SPP.name_id = PN.id INNER JOIN
- rhnPackageEVR PE ON SPP.evr_id = PE.id
+ FROM rhnServerProfilePackage SPP
+ LEFT JOIN rhnPackageArch PA ON SPP.package_arch_id = PA.id
+ INNER JOIN rhnPackageName PN ON SPP.name_id = PN.id
+ INNER JOIN rhnPackageEVR PE ON SPP.evr_id = PE.id
WHERE SPP.server_profile_id = :prid
ORDER BY UPPER(PN.name), PE.evr
</query>
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java
index 38ecfc1..97c2cf6 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java
@@ -25,12 +25,12 @@ import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import com.redhat.rhn.domain.rhnpackage.profile.Profile;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
-import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
-import com.redhat.rhn.domain.rhnpackage.profile.Profile;
import com.redhat.rhn.manager.profile.ProfileManager;
/**
@@ -63,7 +63,7 @@ public class PackageListAction extends RhnAction implements Listable {
Map params = new HashMap();
params.put(RequestContext.PRID, context.getRequiredParam(RequestContext.PRID));
- ListSessionSetHelper helper = new ListSessionSetHelper(this, request, params);
+ ListHelper helper = new ListHelper(this, request, params);
helper.setDataSetName(DATA_SET);
helper.execute();
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index 38890e7..36a9a59 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -1040,6 +1040,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
retval = ProfileManager.createProfile(
ProfileFactory.TYPE_SYNC_PROFILE, this.user,
otherServer.getBaseChannel(), pname, pname);
+ ProfileManager.copyFrom(otherServer, retval);
}
this.kickstartSession.setServerProfile(retval);
KickstartFactory.saveKickstartSession(this.kickstartSession);
Show replies by thread