Branch 'VADER' - java/code
by jdob
java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 2 +-
java/code/webapp/WEB-INF/pages/errata/published.jsp | 1 +
java/code/webapp/WEB-INF/pages/errata/unpublished.jsp | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 0c30fafd3cdd6df2f1051dcb5707427d8d0f2d0c
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Thu Apr 2 17:29:04 2009 -0500
493187 - Changed empty list message to be a variable and set in calling pages specific to need (published v. unpublished)
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
index accbd2e..619734c 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
@@ -1,6 +1,6 @@
<rl:listset name="groupSet" legend="errata">
- <rl:list emptykey="erratalist.jsp.deleteerrata">
+ <rl:list emptykey="${emptyListKey}">
<rl:decorator name="PageSizeDecorator"/>
<rl:decorator name="SelectableDecorator"/>
diff --git a/java/code/webapp/WEB-INF/pages/errata/published.jsp b/java/code/webapp/WEB-INF/pages/errata/published.jsp
index 67cfba7..402a1be 100644
--- a/java/code/webapp/WEB-INF/pages/errata/published.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/published.jsp
@@ -26,6 +26,7 @@
<bean:message key="erratalist.jsp.ownederratapagesummary"/>
</div>
<c:set var="pageList" value="${requestScope.pageList}" />
+<c:set var="emptyListKey" value="erratalist.jsp.nopublishederrata"/>
<%@ include file="/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf" %>
diff --git a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
index 0a2bc6b..54a90b8 100644
--- a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
@@ -26,6 +26,7 @@
<bean:message key="erratalist.jsp.ownederratapagesummary"/>
</div>
<c:set var="pageList" value="${requestScope.pageList}" />
+<c:set var="emptyListKey" value="erratalist.jsp.nounpublishederrata"/>
<%@ include file="/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf" %>
15 years, 2 months
java/code
by jdob
java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 2 +-
java/code/webapp/WEB-INF/pages/errata/published.jsp | 1 +
java/code/webapp/WEB-INF/pages/errata/unpublished.jsp | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a88869978a64165a131c722e65cdb6bc82a76259
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Thu Apr 2 17:29:04 2009 -0500
493187 - Changed empty list message to be a variable and set in calling pages specific to need (published v. unpublished)
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
index accbd2e..619734c 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
@@ -1,6 +1,6 @@
<rl:listset name="groupSet" legend="errata">
- <rl:list emptykey="erratalist.jsp.deleteerrata">
+ <rl:list emptykey="${emptyListKey}">
<rl:decorator name="PageSizeDecorator"/>
<rl:decorator name="SelectableDecorator"/>
diff --git a/java/code/webapp/WEB-INF/pages/errata/published.jsp b/java/code/webapp/WEB-INF/pages/errata/published.jsp
index 67cfba7..402a1be 100644
--- a/java/code/webapp/WEB-INF/pages/errata/published.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/published.jsp
@@ -26,6 +26,7 @@
<bean:message key="erratalist.jsp.ownederratapagesummary"/>
</div>
<c:set var="pageList" value="${requestScope.pageList}" />
+<c:set var="emptyListKey" value="erratalist.jsp.nopublishederrata"/>
<%@ include file="/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf" %>
diff --git a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
index 0a2bc6b..54a90b8 100644
--- a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
@@ -26,6 +26,7 @@
<bean:message key="erratalist.jsp.ownederratapagesummary"/>
</div>
<c:set var="pageList" value="${requestScope.pageList}" />
+<c:set var="emptyListKey" value="erratalist.jsp.nounpublishederrata"/>
<%@ include file="/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf" %>
15 years, 2 months
java/code
by Brad Buckingham
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 3f265e1dc3d91cb89a206469bb1d044d9c5ee7c2
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Thu Apr 2 16:56:08 2009 -0400
fix junit assertion error in testDeleteTreeAndProfiles
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java
index 03058c7..a686c59 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java
@@ -118,8 +118,8 @@ public class KickstartTreeHandlerTest extends BaseHandlerTestCase {
List ksProfiles = ksHandler.listKickstarts(adminKey);
assertNotNull(ksTrees);
assertNotNull(ksProfiles);
- assertEquals(1, ksTrees.size());
- assertEquals(1, ksProfiles.size());
+ Integer numKsTrees = ksTrees.size();
+ Integer numKsProfiles = ksProfiles.size();
// execute test...
int result = handler.deleteTreeAndProfiles(adminKey, testTree.getLabel());
@@ -130,8 +130,8 @@ public class KickstartTreeHandlerTest extends BaseHandlerTestCase {
ksProfiles = ksHandler.listKickstarts(adminKey);
assertNotNull(ksTrees);
assertNotNull(ksProfiles);
- assertEquals(0, ksTrees.size());
- assertEquals(0, ksProfiles.size());
+ assertEquals(numKsTrees - 1, ksTrees.size());
+ assertTrue(ksProfiles.size() < numKsProfiles);
}
public void testListTreeTypes() throws Exception {
15 years, 2 months
Branch 'VADER' - java/code
by Brad Buckingham
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 116f73dc99697e4a19393ebfa36ffdb7a494352f
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Thu Apr 2 16:56:08 2009 -0400
fix junit assertion error in testDeleteTreeAndProfiles
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java
index 03058c7..a686c59 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java
@@ -118,8 +118,8 @@ public class KickstartTreeHandlerTest extends BaseHandlerTestCase {
List ksProfiles = ksHandler.listKickstarts(adminKey);
assertNotNull(ksTrees);
assertNotNull(ksProfiles);
- assertEquals(1, ksTrees.size());
- assertEquals(1, ksProfiles.size());
+ Integer numKsTrees = ksTrees.size();
+ Integer numKsProfiles = ksProfiles.size();
// execute test...
int result = handler.deleteTreeAndProfiles(adminKey, testTree.getLabel());
@@ -130,8 +130,8 @@ public class KickstartTreeHandlerTest extends BaseHandlerTestCase {
ksProfiles = ksHandler.listKickstarts(adminKey);
assertNotNull(ksTrees);
assertNotNull(ksProfiles);
- assertEquals(0, ksTrees.size());
- assertEquals(0, ksProfiles.size());
+ assertEquals(numKsTrees - 1, ksTrees.size());
+ assertTrue(ksProfiles.size() < numKsProfiles);
}
public void testListTreeTypes() throws Exception {
15 years, 2 months
Changes to 'refs/tags/spacewalk-backend-0.5.31-1'
by Pradeep Kilambi
Tag 'spacewalk-backend-0.5.31-1' created by Pradeep Kilambi <pkilambi(a)redhat.com> at 2009-04-02 20:45 +0000
Tagging package [spacewalk-backend] version [0.5.31-1] in directory [backend/].
Changes since spacewalk-backend-0.5.30-1:
Pradeep Kilambi (1):
Automatic commit of package [spacewalk-backend] release [0.5.31-1].
---
backend/spacewalk-backend.spec | 4 ++--
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
15 years, 2 months
Branch 'SPACEWALK-0.5' - backend/spacewalk-backend.spec rel-eng/packages
by Pradeep Kilambi
backend/spacewalk-backend.spec | 4 ++--
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b5eb04a71188aba093592353c5ab801c6e5bec2e
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Thu Apr 2 16:45:32 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.5.31-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 016f3d5..7e3b8d9 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.5.30
+Version: 0.5.31
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -562,7 +562,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
-* Thu Apr 02 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.5.30-1
+* Thu Apr 02 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.5.31-1
- adding some additional checks before creating first org info
(pkilambi(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index c877f80..7f0a69d 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.5.30-1 backend/
+0.5.31-1 backend/
15 years, 2 months
Branch 'SPACEWALK-0.5' - backend/spacewalk-backend.spec rel-eng/packages
by Pradeep Kilambi
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit b682851e8575757eddb158ea36a69ac0a591fb33
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Thu Apr 2 16:42:29 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.5.30-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 9ac01a1..016f3d5 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.5.28
+Version: 0.5.30
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -562,6 +562,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Apr 02 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.5.30-1
+- adding some additional checks before creating first org info
+ (pkilambi(a)redhat.com)
+
* Mon Mar 30 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.5.28-1
- 485698 - rhn-satellite-exporter manual page fixes
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a63cd47..c877f80 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.5.28-1 backend/
+0.5.30-1 backend/
15 years, 2 months
Changes to 'refs/tags/spacewalk-backend-0.5.30-1'
by Pradeep Kilambi
Tag 'spacewalk-backend-0.5.30-1' created by Pradeep Kilambi <pkilambi(a)redhat.com> at 2009-04-02 20:42 +0000
Tagging package [spacewalk-backend] version [0.5.30-1] in directory [backend/].
Changes since spacewalk-repo-0.5-2-1:
---
0 files changed
---
15 years, 2 months
Branch 'vader' - 2 commits - backend/common java/code
by Pradeep Kilambi
backend/common/rhn_rpm.py | 4 ++--
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 0b95c82d4305a40b9661abd48a4a28b670326d66
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Thu Apr 2 16:15:28 2009 -0400
check the attr instead of try catch
diff --git a/backend/common/rhn_rpm.py b/backend/common/rhn_rpm.py
index 3b622e6..3d0efcc 100644
--- a/backend/common/rhn_rpm.py
+++ b/backend/common/rhn_rpm.py
@@ -268,12 +268,12 @@ def get_package_header(filename=None, file=None, fd=None):
if hdr is None:
raise InvalidPackageError
else:
- try:
+ if hasattr(rpm, 'rpmHeaderFromFD'):
header_start, header_end = \
get_header_byte_range(os.fdopen(os.dup(file_desc)))
os.lseek(file_desc, header_start, 0)
hdr, offset = rpm.readHeaderFromFD(file_desc)
- except AttributeError:
+ else:
# RHEL-4 and older, do the old way
ts = RPMReadOnlyTransaction()
nomd5 = getattr(rpm, 'RPMVSF_NOMD5')
commit 83bc9c02cc1f55425e22b8bfd53beaa3fcb234c7
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Apr 2 16:01:49 2009 -0400
485317 - fixing issue where phantom kickstart sessions would show up on the kickstart overview
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
index a50fc70..827b90a 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
@@ -145,6 +145,8 @@ ORDER BY KSIPR.min
AND KSS.kickstart_id = KSD.id
AND KSS.state_id = KSST.id
AND KSST.label = 'created'
+ and ( KSS.client_ip is not null or KSS.old_server_id is not null)
+ order by last_modified desc
</query>
</mode>
15 years, 2 months