java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 8 +++++++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit d8a0fbfcd7206706c0ff83786de80fb3f39e6ca2
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Mar 27 16:52:16 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.27-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 360d352..03dbe1f 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.26
+Version: 1.8.27
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -603,6 +603,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Mar 27 2012 Stephen Herr <sherr(a)redhat.com> 1.8.27-1
+- 807463 - If our channel is a clone of a clone we need to find the channel
+ that contains the erratum we are cloning (sherr(a)redhat.com)
+
* Tue Mar 27 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.26-1
- fix KickstartDataTest.testCommands (tlestach(a)redhat.com)
- fixin cobbler version issue (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 40e1b59..7d3dfb4 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.26-1 java/
+1.8.27-1 java/
commit 35ab17cba1d6dfa85e2c2417c11a3f7c8fcf028d
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Mar 27 16:51:39 2012 -0400
807463 - If our channel is a clone of a clone we need to find the channel that
contains the erratum we are cloning
diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
index 82a718b..586be0b 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
@@ -242,7 +242,7 @@ public class ErrataFactory extends HibernateFactory {
* @param chan channel to publish it into.
* @param user the user doing the pushing
* @param inheritPackages include only original channel packages
- * @return the publsihed errata
+ * @return the published errata
*/
public static List<Errata> publishToChannel(List<Errata> errataList,
Channel chan,
User user, boolean inheritPackages) {
@@ -263,6 +263,12 @@ public class ErrataFactory extends HibernateFactory {
chan.getLabel());
}
Channel original = ((ClonedChannel) chan).getOriginal();
+ // see BZ 805714, if we are a clone of a clone the 1st clone
+ // may not have the errata we want
+ while (original.isCloned() &&
+ !original.getErratas().contains(errata)) {
+ original = ChannelFactory.lookupOriginalChannel(original);
+ }
packs = ErrataManager.listErrataChannelPacks(original, errata, user);
}
else {