java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java | 9 ++++++++-
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 7 +++++++
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit f7eefed0ea337a932bc9d8ce88950026b4a2962e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 12:10:16 2011 +0200
683200 - encode hostname to IDN in systems/Search.do page
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java b/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java
index f9fd069..c0e8244 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java
@@ -20,7 +20,7 @@ import org.apache.log4j.Logger;
import java.lang.reflect.InvocationTargetException;
import java.util.Calendar;
-
+import java.net.IDN;
/**
* SystemSearchResult
@@ -162,6 +162,13 @@ public class SystemSearchResult extends SystemOverview {
}
/**
+ * @return the hostname in IDN encoding
+ */
+ public String getDecodedHostname() {
+ return (hostname == null) ? null : IDN.toUnicode(hostname);
+ }
+
+ /**
* @return the description
*/
public String getDescription() {
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
index f8cc9d6..2e1787e 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
@@ -160,6 +160,13 @@
</rhn:highlight>
</rl:column>
</c:when>
+ <c:when test="${view_mode == 'systemsearch_hostname'}">
+ <rl:column bound="false" headerkey="${view_mode}">
+ <rhn:highlight tag="strong" text="${search_string}">
+ ${current.decodedHostname}
+ </rhn:highlight>
+ </rl:column>
+ </c:when>
<c:otherwise>
<rl:column bound="false" headerkey="${view_mode}">
<rhn:highlight tag="strong" text="${search_string}">
12 years, 12 months
java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java | 7 ++++++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 11 +++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 0d6d46f29e666cff294689b471a6a363f83c9077
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 11:48:30 2011 +0200
683200 - encode hostname to IDN in DuplicateHostName.do page
diff --git a/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java b/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java
index 2eab6c9..62634fb 100644
--- a/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java
+++ b/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java
@@ -50,6 +50,13 @@ public class DuplicateSystemGrouping implements Expandable, Identifiable {
}
/**
+ * @param newKey String Set new key
+ */
+ public void setKey(String newKey) {
+ key = newKey;
+ }
+
+ /**
* Add a object to the bucket if there is a match
*
* @param net the object to add
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index f1f9b7b..b80653b 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -87,12 +87,14 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.ListIterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.net.IDN;
/**
* SystemManager
@@ -2764,8 +2766,15 @@ public class SystemManager extends BaseManager {
* @return List of DuplicateSystemBucket objects
*/
public static List listDuplicatesByHostname(User user, Long inactiveHours) {
- return listDuplicates(user, "duplicate_system_ids_hostname",
+ List<DuplicateSystemGrouping> duplicateSystems = listDuplicates(user,
+ "duplicate_system_ids_hostname",
Collections.EMPTY_LIST, inactiveHours);
+ ListIterator litr = duplicateSystems.listIterator();
+ while (litr.hasNext()) {
+ DuplicateSystemGrouping element = (DuplicateSystemGrouping)litr.next();
+ element.setKey(IDN.toUnicode(element.getKey()));
+ }
+ return duplicateSystems;
}
/**
12 years, 12 months
Changes to 'refs/tags/spacewalk-java-1.5.17-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.5.17-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-03 08:47 +0000
Tagging package [spacewalk-java] version [1.5.17-1] in directory [java/].
Changes since spacewalk-java-1.5.16-1:
Miroslav Suchý (2):
checkstyle - Line has trailing spaces
Automatic commit of package [spacewalk-java] release [1.5.17-1].
---
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 12 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 80b9c2d2fb42334aa07496cd7293a4f312a0484c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:47:34 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.17-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6e0e3ec..0b187e8 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.16
+Version: 1.5.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 03 2011 Miroslav Suchý 1.5.17-1
+- checkstyle - Line has trailing spaces (msuchy(a)redhat.com)
+
* Tue May 03 2011 Miroslav Suchý 1.5.16-1
- 673392 - alter channel subscriptions: display flex consumption
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 95ddb50..9f99755 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.16-1 java/
+1.5.17-1 java/
commit f32efb329fa6b7f27f5be2e1790419a4c22868db
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:46:58 2011 +0200
checkstyle - Line has trailing spaces
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index dbc9e92..f1f9b7b 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2031,7 +2031,7 @@ public class SystemManager extends BaseManager {
// Not free. Check to see if we're a guest, and there are FVEs available.
// Note that for FVEs, NULL == NOT FOUND
if (isServerFveEligible(serverIn)) {
- Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn,
+ Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn,
channelIn);
if (availableFVEs != null && (availableFVEs.longValue() > 0)) {
return true;
12 years, 12 months
Changes to 'refs/tags/spacewalk-java-1.5.16-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.5.16-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-03 08:38 +0000
Tagging package [spacewalk-java] version [1.5.16-1] in directory [java/].
Changes since osad-5.10.15-1:
Milan Zazrivec (1):
673392 - alter channel subscriptions: display flex consumption
Miroslav Suchý (4):
code style - '}' should be alone on a line.
code style - Conditional logic can be removed.
checkstyle - Line is longer than 92 characters.
Automatic commit of package [spacewalk-java] release [1.5.16-1].
---
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java | 10 +
java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java | 16 ++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 74 +++-------
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 26 ++-
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
6 files changed, 75 insertions(+), 58 deletions(-)
---
12 years, 12 months
4 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 9 +++------
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 4a0705ea4f9eda137987d7eb333efee46ff7ed7a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:38:56 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.16-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 98cf901..6e0e3ec 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.15
+Version: 1.5.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 03 2011 Miroslav Suchý 1.5.16-1
+- 673392 - alter channel subscriptions: display flex consumption
+
* Mon May 02 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.15-1
- removing unused imports (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1dada0a..95ddb50 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.15-1 java/
+1.5.16-1 java/
commit 18bb9cf274996dff7fbcbce5de7bc030b524a379
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:37:53 2011 +0200
checkstyle - Line is longer than 92 characters.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 9897e64..dbc9e92 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2031,7 +2031,8 @@ public class SystemManager extends BaseManager {
// Not free. Check to see if we're a guest, and there are FVEs available.
// Note that for FVEs, NULL == NOT FOUND
if (isServerFveEligible(serverIn)) {
- Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn, channelIn);
+ Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn,
+ channelIn);
if (availableFVEs != null && (availableFVEs.longValue() > 0)) {
return true;
}
commit 5ab7dad63e0049fc0acfb5205a26d42fe26b9912
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:35:38 2011 +0200
code style - Conditional logic can be removed.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index fc5c50a..9897e64 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2003,12 +2003,7 @@ public class SystemManager extends BaseManager {
Map params = new HashMap();
params.put("sid", serverIn.getId());
- if (m.execute(params).size() >= 1) {
- return true;
- }
- else {
- return false;
- }
+ return (m.execute(params).size() >= 1);
}
commit 1961c4afbda50d218e0f0f603f6c25c30268761f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:33:35 2011 +0200
code style - '}' should be alone on a line.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 358d5c1..fc5c50a 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2005,7 +2005,8 @@ public class SystemManager extends BaseManager {
if (m.execute(params).size() >= 1) {
return true;
- } else {
+ }
+ else {
return false;
}
}
12 years, 12 months
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java | 10 +
java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java | 16 ++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 77 +++-------
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 26 ++-
4 files changed, 73 insertions(+), 56 deletions(-)
New commits:
commit 30f6fe90f434d41d888283166205016b835da4f5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon May 2 18:26:21 2011 +0200
673392 - alter channel subscriptions: display flex consumption
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
index 3e7f04c..dbde178 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
@@ -76,6 +76,7 @@ public class SystemChannelsAction extends RhnLookupDispatchAction {
public static final String CURRENT_BASE_CHANNEL = "current_base_channel";
public static final String CURRENT_BASE_CHANNEL_ID = "current_base_channel_id";
public static final String NEW_BASE_CHANNEL = "new_base_channel";
+ public static final String SERVER_FVE_ELIGIBLE = "server_fve_eligible";
/** {@inheritDoc} */
@@ -91,6 +92,7 @@ public class SystemChannelsAction extends RhnLookupDispatchAction {
// Setup request attributes
request.setAttribute(RequestContext.SYSTEM, s);
+ request.setAttribute(SERVER_FVE_ELIGIBLE, SystemManager.isServerFveEligible(s));
if (s.getBaseChannel() != null) {
Channel baseChannel = s.getBaseChannel();
List channels = baseChannel.getAccessibleChildrenFor(user);
@@ -107,8 +109,12 @@ public class SystemChannelsAction extends RhnLookupDispatchAction {
child.isSubscribable(user.getOrg(), s));
childchannels[i].setAvailableSubscriptions(
- SystemManager.availableSystemChannelSubscriptions(
- s, child, user.getOrg()));
+ ChannelManager.getAvailableEntitlements(
+ user.getOrg(), child));
+
+ childchannels[i].setAvailableFveSubscriptions(
+ ChannelManager.getAvailableFveEntitlements(
+ user.getOrg(), child));
}
request.setAttribute(AVAIL_CHILD_CHANNELS, childchannels);
form.set(NEW_BASE_CHANNEL_ID, s.getBaseChannel().getId());
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java b/java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java
index 1cc9c2e..6e47971 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java
@@ -28,6 +28,7 @@ public class ChildChannelDto {
private boolean isFreeForGuests;
private boolean isSubscribable;
private Long availableSubscriptions;
+ private Long availableFveSubscriptions;
private Long systemCount;
/**
@@ -148,6 +149,21 @@ public class ChildChannelDto {
this.availableSubscriptions = availableSubscriptionsIn;
}
+ /**
+ * @return Returns the availableFveSubscriptions.
+ */
+ public Long getAvailableFveSubscriptions() {
+ return availableFveSubscriptions;
+ }
+
+
+ /**
+ * @param availableFveSubscriptionsIn The availableFveSubscriptions to set.
+ */
+ public void setAvailableFveSubscriptions(Long availableFveSubscriptionsIn) {
+ this.availableFveSubscriptions = availableFveSubscriptionsIn;
+ }
+
/**
* @return Returns the isSubscribable.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 0513f61..358d5c1 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -1992,6 +1992,25 @@ public class SystemManager extends BaseManager {
}
}
+
+ /**
+ * Check if a given Server is FVE eligible
+ * @param serverIn to check
+ * @return true if Server is FVE eligible, false otherwise
+ */
+ public static boolean isServerFveEligible(Server serverIn) {
+ SelectMode m = ModeFactory.getMode("System_queries", "is_server_fve_eligible");
+ Map params = new HashMap();
+ params.put("sid", serverIn.getId());
+
+ if (m.execute(params).size() >= 1) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+
/**
* Check to see if an attempt to subscribe the passed in server to the
* passed in channel will succeed. Checks available slots, if the channel is
@@ -2004,64 +2023,28 @@ public class SystemManager extends BaseManager {
*/
public static boolean canServerSubscribeToChannel(Org orgIn, Server serverIn,
Channel channelIn) {
-
if (serverIn.isSubscribed(channelIn)) {
- log.debug("already subscribed. return true");
return true;
}
// If channel is free for this guest, dont check avail subs
if (ChannelManager.isChannelFreeForSubscription(serverIn, channelIn)) {
- log.debug("its a free channel for this server, returning true");
return true;
}
- Long availableSubscriptions = availableSystemChannelSubscriptions(serverIn,
- channelIn, orgIn);
-
- if (availableSubscriptions != null && (availableSubscriptions.longValue() < 1)) {
- log.debug("avail subscriptions is to small : " + availableSubscriptions);
- return false;
- }
- log.debug("canServerSubscribeToChannel true!");
- return true;
- }
-
- /**
- * For given Server, Channel and Org return number of available subscriptions
- * @param serverIn Server to check
- * @param channelIn Channel to check
- * @param orgIn Org to check
- * @return number of subscriptions available
- */
- public static Long availableSystemChannelSubscriptions(Server serverIn,
- Channel channelIn, Org orgIn) {
- SelectMode m = ModeFactory.getMode("System_queries", "is_server_fve_eligible");
- Map params = new HashMap();
- params.put("sid", serverIn.getId());
-
- Long availableSubscriptions = null;
-
- /* Check if the channel is consumable for free */
- if (ChannelManager.isChannelFreeForSubscription(serverIn, channelIn)) {
- return availableSubscriptions;
- }
-
- /* If serverIn is fve eligible, check number of flex guest entitlements available */
- if (m.execute(params).size() >= 1) {
- availableSubscriptions =
- ChannelManager.getAvailableFveEntitlements(orgIn, channelIn);
- }
-
- /* If the previous query did not result any data or the number of flex guest
- * subscriptions is zero, check number of regular entitlements available
- */
- if ((availableSubscriptions == null) || (availableSubscriptions.longValue() < 1)) {
- availableSubscriptions = ChannelManager.getAvailableEntitlements(orgIn,
- channelIn);
+ // Not free. Check to see if we're a guest, and there are FVEs available.
+ // Note that for FVEs, NULL == NOT FOUND
+ if (isServerFveEligible(serverIn)) {
+ Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn, channelIn);
+ if (availableFVEs != null && (availableFVEs.longValue() > 0)) {
+ return true;
+ }
}
- return availableSubscriptions;
+ // Finally, check available physical subs
+ // Note that for PHYS SUBS, NULL == UNLIMITED
+ Long availableSubs = ChannelManager.getAvailableEntitlements(orgIn, channelIn);
+ return ((availableSubs == null) || (availableSubs.longValue() > 0));
}
/**
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
index 6ed6023..45426a2 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
@@ -44,15 +44,27 @@
<c:if test="${not channel.subscribed}">
<input ${disabledChannel} name="child_channel" value="${channel.id}" type="checkbox" id="unchecked">
</c:if>
- <c:if test="${not channel.freeForGuests && system.virtualGuest && channel.availableSubscriptions != null}">
- <span class="asterisk">* </span>
- </c:if>
<a href="/rhn/channels/ChannelDetail.do?cid=${channel.id}">${channel.name}</a>
- <c:if test="${channel.availableSubscriptions != null}">
- (<strong>${channel.availableSubscriptions}</strong> <bean:message key="sdc.channels.edit.available"/>)
+ <c:if test="${system.virtualGuest}">
+ <c:if test="${not channel.freeForGuests}">
+ <span class="asterisk">* </span>
+ </c:if>
+ <c:choose>
+ <c:when test="${channel.freeForGuests && system.virtualInstance.hostSystem != null}">
+ (<bean:message key="sdc.channels.edit.unlimited"/>)
+ </c:when>
+
+ <c:when test="${server_fve_eligible && channel.availableFveSubscriptions > 0}">
+ (<strong>${channel.availableFveSubscriptions}</strong> flex <bean:message key="sdc.channels.edit.available"/>)
+ </c:when>
+
+ <c:otherwise>
+ (<strong>${channel.availableSubscriptions}</strong> <bean:message key="sdc.channels.edit.available"/>)
+ </c:otherwise>
+ </c:choose>
</c:if>
- <c:if test="${channel.availableSubscriptions == null}">
- (<bean:message key="sdc.channels.edit.unlimited"/>)
+ <c:if test="${not system.virtualGuest}">
+ (<strong>${channel.availableSubscriptions}</strong> <bean:message key="sdc.channels.edit.available"/>)
</c:if>
</li>
</c:forEach>
12 years, 12 months
Changes to 'refs/tags/osad-5.10.15-1'
by Jan Pazdziora
Tag 'osad-5.10.15-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-02 15:05 +0000
Tagging package [osad] version [5.10.15-1] in directory [client/tools/osad/].
Changes since SatConfig-generator-2.29.13-1:
Jan Pazdziora (3):
Revert "bump up epoch, and match version of osad with spacewalk version".
Bumping up version to get above the one we backported to Spacewalk 1.4.
Automatic commit of package [osad] release [5.10.15-1].
---
client/tools/osad/osad.spec | 9 +++++++--
rel-eng/packages/osad | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
---
12 years, 12 months
2 commits - client/tools rel-eng/packages
by Jan Pazdziora
client/tools/osad/osad.spec | 8 +++++++-
rel-eng/packages/osad | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 6dee6f4da5665fd95d31ded13048af6ac8d523f1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 17:05:52 2011 +0200
Automatic commit of package [osad] release [5.10.15-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 50b6dda..dd6a92f 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -275,6 +275,12 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Mon May 02 2011 Jan Pazdziora 5.10.15-1
+- Bumping up version to get above the one we backported to Spacewalk 1.4.
+- Revert "bump up epoch, and match version of osad with spacewalk version".
+- bump up epoch, and match version of osad with spacewalk version
+ (msuchy(a)redhat.com)
+
* Fri Apr 15 2011 Jan Pazdziora 5.10.12-1
- require python-hashlib only on rhel and rhel <= 5 (mc(a)suse.de)
- build osad on SUSE (mc(a)suse.de)
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index f8c8954..d950679 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.12-1 client/tools/osad/
+5.10.15-1 client/tools/osad/
commit bb27126c682f28b965f0afe9fa291fa529072d50
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 17:05:29 2011 +0200
Bumping up version to get above the one we backported to Spacewalk 1.4.
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index faf044f..50b6dda 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.12
+Version: 5.10.15
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
12 years, 12 months
client/tools
by Jan Pazdziora
client/tools/osad/osad.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 2d98da788ce83399b878c595a4e98b9fc8d14708
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 17:03:58 2011 +0200
Revert "bump up epoch, and match version of osad with spacewalk version".
No need to make our life harder by setting the epoch.
This reverts commit c0bdfc3dbfe13ed73a0b0307de9bddb32a845ffa.
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 38fbb51..faf044f 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,8 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Epoch: 1
-Version: 1.5.0
+Version: 5.10.12
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
12 years, 12 months