java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 6 ++--
java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java | 15
++++++++++
java/spacewalk-java.spec | 5 ++-
rel-eng/packages/spacewalk-java | 2 -
4 files changed, 23 insertions(+), 5 deletions(-)
New commits:
commit e58121cbd40d047700e8875714588215ed0b8c1e
Author: Mike McCune <mmccune(a)gmail.com>
Date: Mon Mar 30 15:29:18 2009 -0700
Automatic commit of package [spacewalk-java] release [0.5.43-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a6423ce..37a3bf9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -10,7 +10,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.5.42
+Version: 0.5.43
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -235,7 +235,8 @@ fi
%attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog
-* Mon Mar 30 2009 Mike McCune <mmccune(a)gmail.com> 0.5.42-1
+* Mon Mar 30 2009 Mike McCune <mmccune(a)gmail.com> 0.5.43-1
+- 472595 - ported query forgot to check child channels
- 144325 - converting system probe list to the new list tag, featuring all the bells and
whistles the new list tag has to offer
- 492478 - modifying the system applicable errata page so that you can filter on the
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 29807a7..f6db4d9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.5.42-1 java/
+0.5.43-1 java/
commit 862a56d78734d05e93fdc2d9eafaf3b36ead96ed
Author: Mike McCune <mmccune(a)gmail.com>
Date: Mon Mar 30 15:25:33 2009 -0700
472595 - ported query forgot to check child channels
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 3a53ab8..c6803d5 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
@@ -291,8 +291,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
FROM rhnPackage {p}
left join rhnSolarisPatchSet P_2_ on p.id = P_2_.package_id
left join rhnSolarisPatch P_1_ on p.id = P_1_.package_id,
- rhnChannelPackage CP
- WHERE CP.channel_id = :channel_id
+ rhnChannelPackage CP,
+ rhnChannel C
+ WHERE (C.id = :channel_id OR C.parent_channel = :channel_id)
+ AND (CP.channel_id = C.id OR CP.channel_id = C.parent_channel)
AND CP.package_id = P.id
AND P.path LIKE :pathlike
]]>
diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
index 70a94d8..dca4ede 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
@@ -362,5 +362,20 @@ public class ChannelFactoryTest extends RhnBaseTestCase {
fileName);
assertNotNull(lookedUp);
assertEquals(p.getId(), lookedUp.getId());
+
+ // Test in child channel.
+ Channel child = ChannelTestUtils.createChildChannel(user, channel);
+ Package cp =
PackageManagerTest.addPackageToChannel("some-package-child", child);
+ String fileNameChild = "some-package-child-2.13.1-6.fc9.x86_64.rpm";
+ cp.setPath("redhat/1/c7d/some-package-child/2.13.1-6.fc9/" +
+ "x86_64/c7dd5e9b6975bc7f80f2f4657260af53/" +
+ fileNameChild);
+
+ Package lookedUpChild = ChannelFactory.lookupPackageByFilename(channel,
+ fileNameChild);
+ assertNotNull(lookedUpChild);
+ assertEquals(cp.getId(), lookedUpChild.getId());
+
+
}
}