java/code/src/com/redhat/rhn/domain/channel/Channel.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 4f4be35b9258cd089fce4fc14389222f596bc2a0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Sep 30 15:57:05 2009 +0200
523673 - generate repomd for zstreams too
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
index 21dcb70..d4f0285 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
@@ -790,9 +790,18 @@ public class Channel extends BaseDomainHelper implements Comparable
{
toConsider = toConsider.getParentChannel();
}
+ String release = null;
DistChannelMap channelDist = ChannelFactory.lookupDistChannelMap(toConsider);
if (channelDist != null) {
- String release = channelDist.getRelease();
+ release = channelDist.getRelease();
+ }
+ else { // and now again for zstreams
+ ReleaseChannelMap channelRelease =
ChannelFactory.lookupDefaultReleaseChannelMapForChannel(toConsider);
+ if (channelRelease != null) {
+ release = channelRelease.getRelease();
+ }
+ }
+ if (release != null) {
if (!releaseToSkipRepodata.contains(release)) {
repodataRequired = true;
log.debug("isChannelRepodataRequired for channel(" + this.id +
") " +
Show replies by date