backend/satellite_tools/repo_plugins/yum_src.py | 2 +-
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 98edcaf5762b16d47ca15c4c32fb22a9a20d6254
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 26 13:48:23 2011 +0100
fixed AttributeError: ContentSource instance has no attribute 'proxy'
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py
b/backend/satellite_tools/repo_plugins/yum_src.py
index 7afc6d4..982ff48 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -59,7 +59,7 @@ class ContentSource:
repo.mirrorlist = self.url
repo.baseurl = [self.url]
repo.basecachedir = self.cache_dir
- if self.proxy is not None:
+ if self.proxy_url is not None:
repo.proxy = self.proxy_url
warnings = YumWarnings()
commit 3e8b50c53627391ff3e1ef5a46239724b0bcc6d6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 26 10:50:59 2011 +0100
fixed channel list in create kickstart profile (PG)
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index 9a03d85..0bf1280 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -242,11 +242,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
SELECT {c.*}
FROM rhnChannel c,
rhnSharedChannelView sc,
- rhnChannelCloned c_1_
+ LEFT OUTER JOIN rhnChannelCloned c_1_ ON c.id = c_1_.id
WHERE sc.parent_channel = :cid
AND sc.org_trust_id = :org_id
AND sc.id = c.id
- AND c.id = c_1_.id (+)
]]>
<return alias="c"
class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
Show replies by date