java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 7 +++++++ 1 file changed, 7 insertions(+)
New commits: commit 990de0ead0f2208c551421477b8023a11c7e67ef Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri May 27 14:17:31 2011 +0200
703858 - virt. channel subscription: mimic the behavior of original channel
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index b80653b..1753dac 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -32,6 +32,7 @@ import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorResult; import com.redhat.rhn.common.validator.ValidatorWarning; import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.channel.ClonedChannel; import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.entitlement.Entitlement; import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement; @@ -1570,6 +1571,12 @@ public class SystemManager extends BaseManager { if (!ConfigDefaults.get().isSpacewalk()) { // just install libvirt for RHEL6 base channel Channel base = server.getBaseChannel(); + + if (base.isCloned()) { + ClonedChannel clonedBase = (ClonedChannel) base; + base = clonedBase.getOriginal(); + } + if ((base != null) && base.isRhelChannel() && base.isReleaseXChannel(6)) {
spacewalk-commits@lists.fedorahosted.org