spacewalk-commits October 2012

spacewalk-commits@lists.fedorahosted.org

7 participants
383 discussions

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 29 Oct '12

29 Oct '12

java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 45b4fb8a6982fd4dc052bc0de91e0f0e3ddacdd5 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Oct 29 09:26:50 2012 +0100 Automatic commit of package [spacewalk-java] release [1.8.171-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index bb045ea..5493f09 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -23,7 +23,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.170 +Version: 1.8.171 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -616,6 +616,11 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Oct 29 2012 Jan Pazdziora 1.8.171-1 +- 869428 - last_checkin date should be displayed as UTC for splice integration + API +- WebUI - link to erratas that affect package on its overview page + * Thu Oct 25 2012 Jan Pazdziora 1.8.170-1 - checkstyle fix diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 57bb9a7..f08f244 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.170-1 java/ +1.8.171-1 java/

1 0

java/code
by StephenHerr 25 Oct '12

25 Oct '12

java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 26 ++++++++-- 1 file changed, 22 insertions(+), 4 deletions(-) New commits: commit d9c1258dd79b65de60e6463d0bc32d9bdc4f805b Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Oct 25 11:24:56 2012 -0400 869428 - last_checkin date should be displayed as UTC for splice integration API diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index 5e67f54..d3c1bba 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -147,6 +147,7 @@ import java.io.IOException; import java.io.StringReader; import java.sql.Blob; import java.util.ArrayList; +import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.HashMap; @@ -156,6 +157,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -612,6 +614,22 @@ public class SystemHandler extends BaseHandler { return SystemManager.systemListShortActive(loggedInUser, null); } + private Date convertLocalToUtc(Date in) { + Calendar c = Calendar.getInstance(); + c.setTime(in); + TimeZone z = c.getTimeZone(); + int offset = z.getRawOffset(); + if (z.inDaylightTime(in)) { + offset += z.getDSTSavings(); + } + int offsetHrs = offset / 1000 / 60 / 60; + int offsetMins = offset / 1000 / 60 % 60; + c.add(Calendar.HOUR_OF_DAY, (-offsetHrs)); + c.add(Calendar.MINUTE, (-offsetMins)); + c.set(Calendar.MILLISECOND, 0); + return c.getTime(); + } + /** * Given a list of server ids, will return details about the * systems that are active and visible to the user @@ -632,7 +650,7 @@ public class SystemHandler extends BaseHandler { * #prop_desc("int", "id", "The server's id") * #prop_desc("string", "name", "The server's name") * #prop_desc("dateTime.iso8601", "last_checkin", - * "Last time server successfully checked in ") + * "Last time server successfully checked in (in UTC)") * #prop_desc("int", "ram", "The amount of physical memory in MB.") * #prop_desc("int", "swap", "The amount of swap space in MB.") * #prop_desc("struct", "network_devices", "The server's network devices") @@ -656,8 +674,8 @@ public class SystemHandler extends BaseHandler { * #struct_end() * #array_end() */ - public List<Map<String, Object>> listActiveSystemDetails(String sessionKey, - List<Integer> serverIds) throws FaultException { + public List<Map<String, Object>> listActiveSystemsDetails( + String sessionKey, List<Integer> serverIds) throws FaultException { User loggedInUser = getLoggedInUser(sessionKey); List<Server> servers = XmlRpcSystemHelper.getInstance().lookupServers( loggedInUser, serverIds); @@ -667,7 +685,7 @@ public class SystemHandler extends BaseHandler { Map<String, Object> m = new HashMap<String, Object>(); m.put("id", server.getId()); m.put("name", server.getName()); - m.put("last_checkin", server.getLastCheckin()); + m.put("last_checkin", convertLocalToUtc(server.getLastCheckin())); m.put("ram", server.getRam()); m.put("swap", server.getSwap()); m.put("cpu_info", server.getCpu());

1 0

java/code
by Tomáš Kašpárek 25 Oct '12

25 Oct '12

java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java | 3 ++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 +-- java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp | 12 +++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) New commits: commit 89761c4952df4b549beefccf1ecf34fa37f2891e Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Thu Oct 25 11:13:38 2012 +0200 WebUI - link to erratas that affect package on its overview page diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java index b94830c..1fe0ba4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java @@ -136,6 +136,9 @@ public class PackageDetailsAction extends RhnAction { PackageFactory.findPackagesWithDifferentArch(pkg)); request.setAttribute("pid", pid); + request.setAttribute("erratumEmpty", pkg.getPublishedErrata().isEmpty()); + request.setAttribute("erratum", pkg.getPublishedErrata()); + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); } PackageListItem item = PackageListItem.parse(request.getParameter("id_combo")); diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index d284688..d687fac 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -20463,8 +20463,8 @@ given channel.</source> <source>Errata</source> </trans-unit> - <trans-unit id="package.jsp.erratasearch"> - <source>Search Google for errata</source> + <trans-unit id="package.jsp.errataunavailable"> + <source>No errata are available for this package</source> </trans-unit> <trans-unit id="package.jsp.sunosrelease"> diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp index 9fc9967..cbd1490 100644 --- a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp +++ b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp @@ -240,9 +240,15 @@ <th> <bean:message key="package.jsp.errata" />: </th> - <td><a href="http://www.google.com/search?q=${package_name}+inurl:errata+site:redhat.com" target="_blank"> - <bean:message key="package.jsp.erratasearch" /> - </a></td> + <td> + <c:forEach items="${erratum}" var="tmpErrata"> + <a href="/rhn/errata/details/Details.do?eid=${tmpErrata.id}"><c:out value="${tmpErrata.advisory}" /></a> + </br> + </c:forEach> + <c:if test="${erratumEmpty == true}"> + <bean:message key="package.jsp.errataunavailable" /> + </c:if> + </td> <tr/>

1 0

Changes to 'refs/tags/spacewalk-setup-1.8.22-1'
by Jan Pazdziora 25 Oct '12

25 Oct '12

Tag 'spacewalk-setup-1.8.22-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-25 13:44 +0000 Tagging package [spacewalk-setup] version [1.8.22-1] in directory [spacewalk/setup/]. Changes since spacewalk-java-1.8.170-1: Jan Pazdziora (4): Only start database for embedded scenario. Exit if spacewalk-setup-embedded-postgresql is not installed. Revert "Require spacewalk-setup-embedded-postgresql for spacewalk-setup to work." Automatic commit of package [spacewalk-setup] release [1.8.22-1]. --- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/package/spacewalk.spec | 1 - spacewalk/setup/lib/Spacewalk/Setup.pm | 12 +++++++++++- spacewalk/setup/spacewalk-setup.spec | 6 +++++- 4 files changed, 17 insertions(+), 4 deletions(-) ---

1 0

Changes to 'refs/tags/spacewalk-1.8.6-1'
by Jan Pazdziora 25 Oct '12

25 Oct '12

Tag 'spacewalk-1.8.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-25 13:44 +0000 Tagging package [spacewalk] version [1.8.6-1] in directory [spacewalk/package/]. Changes since spacewalk-java-1.8.170-1: Jan Pazdziora (5): Only start database for embedded scenario. Exit if spacewalk-setup-embedded-postgresql is not installed. Revert "Require spacewalk-setup-embedded-postgresql for spacewalk-setup to work." Automatic commit of package [spacewalk-setup] release [1.8.22-1]. Automatic commit of package [spacewalk] release [1.8.6-1]. --- rel-eng/packages/spacewalk | 2 +- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/package/spacewalk.spec | 7 +++++-- spacewalk/setup/lib/Spacewalk/Setup.pm | 12 +++++++++++- spacewalk/setup/spacewalk-setup.spec | 6 +++++- 5 files changed, 23 insertions(+), 6 deletions(-) ---

1 0

2 commits - rel-eng/packages spacewalk/package spacewalk/setup
by Jan Pazdziora 25 Oct '12

25 Oct '12

rel-eng/packages/spacewalk | 2 +- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/package/spacewalk.spec | 6 +++++- spacewalk/setup/spacewalk-setup.spec | 6 +++++- 4 files changed, 12 insertions(+), 4 deletions(-) New commits: commit 7a0ec7dc09e59720aa62fd406820c6c2fe7a7489 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 25 15:44:20 2012 +0200 Automatic commit of package [spacewalk] release [1.8.6-1]. diff --git a/rel-eng/packages/spacewalk b/rel-eng/packages/spacewalk index ca34ab0..beb7f47 100644 --- a/rel-eng/packages/spacewalk +++ b/rel-eng/packages/spacewalk @@ -1 +1 @@ -1.8.5-1 spacewalk/package/ +1.8.6-1 spacewalk/package/ diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index 7021213..4bbfaf1 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -1,7 +1,7 @@ %define release_name Smile Name: spacewalk -Version: 1.8.5 +Version: 1.8.6 Release: 1%{?dist} Summary: Spacewalk Systems Management Application URL: https://fedorahosted.org/spacewalk @@ -176,6 +176,10 @@ rm -rf %{buildroot} %{_datadir}/spacewalk/setup/defaults.d/postgresql-backend.conf %changelog +* Thu Oct 25 2012 Jan Pazdziora 1.8.6-1 +- Revert "Require spacewalk-setup-embedded-postgresql for spacewalk-setup to + work." + * Thu Oct 25 2012 Jan Pazdziora 1.8.5-1 - Require spacewalk-setup-embedded-postgresql for spacewalk-setup to work. commit 3d68504be7fdf034074918f7cf514dbd9c6fffa2 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 25 15:44:13 2012 +0200 Automatic commit of package [spacewalk-setup] release [1.8.22-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index 6f73b36..9145d14 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -1.8.21-1 spacewalk/setup/ +1.8.22-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index dae2a64..e7eacb2 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 1.8.21 +Version: 1.8.22 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk @@ -110,6 +110,10 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Thu Oct 25 2012 Jan Pazdziora 1.8.22-1 +- Exit if spacewalk-setup-embedded-postgresql is not installed. +- Only start database for embedded scenario. + * Mon Oct 22 2012 Jan Pazdziora 1.8.21-1 - 562287 - pass proxy configuration to spacewalk-setup to store it into rhn.conf file

1 0

2 commits - spacewalk/package spacewalk/setup
by Jan Pazdziora 25 Oct '12

25 Oct '12

spacewalk/package/spacewalk.spec | 1 - spacewalk/setup/lib/Spacewalk/Setup.pm | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 90ce86936175c6c12f925ec1c8f166d273a0a9da Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 25 15:43:09 2012 +0200 Revert "Require spacewalk-setup-embedded-postgresql for spacewalk-setup to work." We now check for spacewalk-setup-embedded-postgresql before running it. This reverts commit aaa8c74a9bea8018055de624b4ead68f82e80dad. diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index 5ee8404..7021213 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -138,7 +138,6 @@ Requires: postgresql84-contrib Requires: postgresql-contrib >= 8.4 %endif Requires: postgresql >= 8.4 -Requires: spacewalk-setup-embedded-postgresql %description postgresql Spacewalk is a systems management application that will commit ffbe22c878fa84c705154e7049ba08d9493824ab Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 25 15:30:37 2012 +0200 Exit if spacewalk-setup-embedded-postgresql is not installed. diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 393b744..ba0553d 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -965,6 +965,14 @@ sub postgresql_setup_embedded_db { return 0; } + if (not -x '/usr/bin/spacewalk-setup-embedded-postgresql') { + print loc(<<EOQ); +The spacewalk-setup-embedded-postgresql does not seem to be available. +You might want to use --external-db command line option. +EOQ + exit 24; + } + if (-d "/var/lib/pgsql/data/base" and ! system(qq{/usr/bin/spacewalk-setup-embedded-postgresql check --db $answers->{'db-name'}})) { my $shared_dir = SHARED_DIR;

1 0

spacewalk/setup
by Jan Pazdziora 25 Oct '12

25 Oct '12

spacewalk/setup/lib/Spacewalk/Setup.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit f09e9d59acb3cd0632a8a1d4fbe7ec466e98547c Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 25 15:27:09 2012 +0200 Only start database for embedded scenario. diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 693a34c..393b744 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -911,7 +911,9 @@ sub postgresql_setup_db { print Spacewalk::Setup::loc("** Database: Setting up database connection for PostgreSQL backend.\n"); my $connected; - postgresql_start(); + if (is_embedded_db($opts)) { + postgresql_start(); + } postgresql_setup_embedded_db($opts, $answers); while (not $connected) {

1 0

Changes to 'refs/tags/spacewalk-java-1.8.170-1'
by Jan Pazdziora 25 Oct '12

25 Oct '12

Tag 'spacewalk-java-1.8.170-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-25 11:39 +0000 Tagging package [spacewalk-java] version [1.8.170-1] in directory [java/]. Changes since spacewalk-schema-1.8.81-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-java] release [1.8.170-1]. --- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 25 Oct '12

25 Oct '12

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit de200517dde38097836de5747bbb84d6a26e8dff Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Oct 25 13:39:18 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.170-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index e43df28..bb045ea 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -23,7 +23,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.169 +Version: 1.8.170 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -616,6 +616,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Oct 25 2012 Jan Pazdziora 1.8.170-1 +- checkstyle fix + * Wed Oct 24 2012 Stephen Herr <sherr(a)redhat.com> 1.8.169-1 - fixing problems in 9d2ad9da4305d41d1d43666b2685eed2136c2f16 - WebUI - css for @media print diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 61679a9..57bb9a7 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.169-1 java/ +1.8.170-1 java/

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits October 2012