java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 5 +--- java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java | 11 +++++++++- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java | 4 +-- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 2 - 4 files changed, 15 insertions(+), 7 deletions(-)
New commits: commit cc27591d44f60ec1dca516e92eab215485404a3c Author: Justin Sherrill jsherril@redhat.com Date: Thu Sep 9 12:55:12 2010 -0400
630595 - fixing issue where a taskomatic restart was required for distros to be synced
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java index 8641848..41e3202 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java @@ -398,6 +398,15 @@ public class KickstartableTree extends BaseDomainHelper { */ public boolean isValid() { return !StringUtils.isBlank(getCobblerId()) && - pathExists(getInitrdPath()) && pathExists(getKernelPath()); + isPathsValid(); } + + /** + * are the paths valid for kernel and initrd + * @return true if valid + */ + public boolean isPathsValid() { + return pathExists(getInitrdPath()) && pathExists(getKernelPath()); + } + } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java index e2c3627..7a2333a 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java @@ -55,7 +55,7 @@ public class CobblerDistroSyncCommand extends CobblerCommand { Map<String, Distro> toReturn = new HashMap<String, Distro>(); List<Distro> distros = Distro.list(CobblerXMLRPCHelper.getAutomatedConnection()); for (Distro distro : distros) { - toReturn.put((String)distro.getUid(), distro); + toReturn.put(distro.getUid(), distro); } return toReturn; } @@ -73,7 +73,7 @@ public class CobblerDistroSyncCommand extends CobblerCommand { String err; for (KickstartableTree tree : unSynced) {
- if (!tree.isValid()) { + if (!tree.isPathsValid()) { log.warn("Could not sync tree " + tree.getLabel()); continue; }
commit b1f0ed451ae3f9b2d4feb6672dc778b2c18cfc3f Author: Justin Sherrill jsherril@redhat.com Date: Thu Sep 9 12:48:41 2010 -0400
widening text file upon user request
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf index 654879b..906ed80 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf @@ -114,7 +114,7 @@ mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <th> <bean:message key="filedetails.details.jspf.revnum"/> </th> <td> - <html:text property="revnum" size="4"/> + <html:text property="revnum" size="7"/> </td> </rhn:require> </tr>
commit a9bcbac1baefadf0b896a8dc0f04a2b3dc2b3a91 Author: Justin Sherrill jsherril@redhat.com Date: Thu Sep 9 12:48:25 2010 -0400
623447 - improving speed of providing_channles call, which is only used through the api, and so its ok to just use org id and not go through the rhNAvailableChannels view which seems very slow for large satellites. We should improve this in the future
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml index 0648804..b502c6a 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml @@ -184,11 +184,10 @@ WHERE id IN <mode name="providing_channels"> <query params="pid, org_id"> SELECT C.id, C.name, C.label - FROM rhnAvailableChannels AC, rhnChannel C, rhnChannelPackage CP + FROM rhnChannel C, rhnChannelPackage CP WHERE CP.package_id = :pid AND CP.channel_id = C.id - AND AC.org_id = :org_id - AND C.id = AC.channel_id + AND (C.org_id = :org_id OR C.org_id is null) ORDER BY UPPER(C.label) </query> </mode>
spacewalk-commits@lists.fedorahosted.org