java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 7 +++++--
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 2f7dbd89fe3cf983f9c5bf00e681fda5bd032eb6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Sep 2 12:03:03 2013 +0200
Automatic commit of package [spacewalk-java] release [2.1.34-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 339fe30..97fec91 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.33
+Version: 2.1.34
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -771,6 +771,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Sep 02 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.34-1
+- 822289 - do not offer compatible child channel if not unique (when changing
+ base channel)
+
* Mon Sep 02 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.33-1
- common.db.datasource tests: get database username from configuration file
- 906315 - Links in API documentation
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 8f4efa1..f2f07d5 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.33-1 java/
+2.1.34-1 java/
commit 9cefb5546fd9879c43b72a35a4b9a91288b9f0ca
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 30 17:17:49 2013 +0200
822289 - do not offer compatible child channel if not unique (when changing base
channel)
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index c4e4861..d7af019 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -2261,16 +2261,19 @@ public class ChannelManager extends BaseManager {
Map <ProductName, Channel> prodChannels =
new HashMap<ProductName, Channel>();
-
+ Map nonUnique = new HashMap<ProductName, Object>();
for (Channel channel : newBaseChannel.getAccessibleChildrenFor(user)) {
if (channel.getProductName() != null) {
+ if (prodChannels.get(channel.getProductName()) != null) {
+ nonUnique.put(channel.getProductName(), null);
+ }
prodChannels.put(channel.getProductName(), channel);
}
}
for (Channel childOne : oldBaseChannel.getAccessibleChildrenFor(user)) {
ProductName name = childOne.getProductName();
- if (prodChannels.containsKey(name)) {
+ if (prodChannels.containsKey(name) && !nonUnique.containsKey(name))
{
compatibleChannels.put(childOne, prodChannels.get(name));
}
}