java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 71a15c8b41a12c1d97521ea79bfda5ed94ba17a2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 21 17:11:55 2011 +0100
fix SystemHandlerTest.testGetSubscribedBaseChannel test
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
index 0f7a0f5..91eecae 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
@@ -1987,10 +1987,11 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
public void testGetSubscribedBaseChannel() throws Exception {
Server srv1 = ServerFactoryTest.createTestServer(regular, true,
ServerConstants.getServerGroupTypeProvisioningEntitled());
- Channel base = (Channel) handler.getSubscribedBaseChannel(adminKey,
+ if (srv1.getBaseChannel() != null) {
+ Channel base = (Channel) handler.getSubscribedBaseChannel(adminKey,
new Integer(srv1.getId().intValue()));
- assertEquals(srv1.getBaseChannel(), base);
-
+ assertEquals(srv1.getBaseChannel(), base);
+ }
}
public void testListInactiveSystems() throws Exception {
13 years, 3 months
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/ConfigRevision.pm | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 7bc9271fcae6cd9dae805708183d3192fb073dc3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 21 16:58:30 2011 +0100
The module Text::Diff is no longer needed, removing its use.
This was orphaned by commit 1cec4ed0df4186bd2970b69d6cc692b12ec38276.
Pointed out by Michael Dahlgren.
diff --git a/web/modules/rhn/RHN/DB/ConfigRevision.pm b/web/modules/rhn/RHN/DB/ConfigRevision.pm
index 5b9f6e2..3ac60ad 100644
--- a/web/modules/rhn/RHN/DB/ConfigRevision.pm
+++ b/web/modules/rhn/RHN/DB/ConfigRevision.pm
@@ -17,7 +17,6 @@ use strict;
package RHN::DB::ConfigRevision;
use Date::Parse;
-use Text::Diff;
use Params::Validate qw/:all/;
Params::Validate::validation_options(strip_leading => "-");
13 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.4.7-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.4.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-02-21 15:16 +0000
Tagging package [spacewalk-java] version [1.4.7-1] in directory [java/].
Changes since spacewalk-reports-1.4.1-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.4.7-1].
---
java/spacewalk-java.spec | 10 +++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
---
13 years, 3 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 10 +++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit f4056793078f1bcaf8fea915e17eabb2d72d5a2f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 21 16:16:02 2011 +0100
Automatic commit of package [spacewalk-java] release [1.4.7-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2375816..7f265af 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.4.6
+Version: 1.4.7
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -534,6 +534,14 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Feb 21 2011 Jan Pazdziora 1.4.7-1
+- Typo in the log message (luc(a)delouw.ch)
+- fix testGetSubscribedBaseChannel test (tlestach(a)redhat.com)
+- 658533 - enable sorting according all the columns except of score on
+ SystemCurrency.do page (tlestach(a)redhat.com)
+- 657548 - do not allow channel names to begin with a digit
+ (tlestach(a)redhat.com)
+
* Fri Feb 18 2011 Jan Pazdziora 1.4.6-1
- Check upon build time that we did not get the @@PRODUCT_NAME@@ template
translated.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1fc32bd..13c4c75 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.4.6-1 java/
+1.4.7-1 java/
13 years, 3 months
Changes to 'refs/tags/spacewalk-reports-1.4.1-1'
by Jan Pazdziora
Tag 'spacewalk-reports-1.4.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-02-21 15:14 +0000
Tagging package [spacewalk-reports] version [1.4.1-1] in directory [reporting/].
Changes since spacewalk-java-1.4.6-1:
Jan Pazdziora (2):
Reporting: system-history proof of concept report.
Automatic commit of package [spacewalk-reports] release [1.4.1-1].
Luc de Louw (1):
Typo in the log message
Miroslav Suchý (1):
add rhnlib and rhn-client-tools to server composes, because rhnpush require new rhnlib
Tomas Lestach (3):
657548 - do not allow channel names to begin with a digit
658533 - enable sorting according all the columns except of score on SystemCurrency.do page
fix testGetSubscribedBaseChannel test
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 2
java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | 2
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java | 2
java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 12 -
rel-eng/comps/comps-spacewalk-server-fedora13.xml | 7
rel-eng/comps/comps-spacewalk-server-fedora14.xml | 7
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 7
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 7
rel-eng/packages/spacewalk-reports | 2
reporting/reports/data/system-history | 82 ++++++++++
reporting/spacewalk-reports.spec | 5
11 files changed, 124 insertions(+), 11 deletions(-)
---
13 years, 3 months
rel-eng/packages reporting/spacewalk-reports.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-reports.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 70810efc1212b3c8cfa8493ef4a83338e74253f8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 21 16:14:26 2011 +0100
Automatic commit of package [spacewalk-reports] release [1.4.1-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index 0500797..540448c 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.3.1-1 reporting/
+1.4.1-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index f2e400c..79bc019 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 1.4.0
+Version: 1.4.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/spacewalk-report.8*
%changelog
+* Mon Feb 21 2011 Jan Pazdziora 1.4.1-1
+- Reporting: system-history proof of concept report.
+
* Thu Nov 25 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.1-1
- fixed namespace of imported modules
13 years, 3 months
reporting/reports
by Jan Pazdziora
reporting/reports/data/system-history | 82 ++++++++++++++++++++++++++++++++++
1 file changed, 82 insertions(+)
New commits:
commit 1c6d11e57b19358dc7f6242972b0391882d6dbce
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 21 16:13:34 2011 +0100
Reporting: system-history proof of concept report.
diff --git a/reporting/reports/data/system-history b/reporting/reports/data/system-history
new file mode 100755
index 0000000..e9af005
--- /dev/null
+++ b/reporting/reports/data/system-history
@@ -0,0 +1,82 @@
+
+synopsis:
+
+ System event history
+
+description:
+
+ Event history for each system. Proof of concept.
+
+columns:
+
+ server_id System identifier
+ event_id Event id
+ time Time of event
+ status Status of the event
+ event Type of the event
+ event_data Additional parameters for the event
+
+multival_columns:
+
+ event_id
+ event_data : event_data
+
+sql:
+
+ select server_id, event_id, time, status, event, event_data
+ from (
+ select rhnserveraction.server_id,
+ rhnserveraction.action_id as event_id,
+ to_char(rhnserveraction.completion_time, 'YYYY-MM-DD HH24:MI:SS') as time,
+ rhnactionstatus.name as status,
+ case when rhnactiontype.name = 'Package Install' and rhnactionpackage.parameter = 'upgrade' then 'Package Upgrade'
+ else rhnactiontype.name end as event,
+ case when rhnactiontype.name = 'Errata Update' then rhnerrata.advisory
+ when rhnactiontype.name in ( 'Package Install', 'Package Removal', 'Verify deployed packages' ) then rhnpackagename.name
+ || case when rhnpackageevr.id is not null then '-' || evr_t_as_vre_simple(rhnpackageevr.evr) end
+ || case when rhnpackagearch.id is not null then '.' || rhnpackagearch.label end
+ when rhnactiontype.label like 'configfiles.%' then rhnconfigfilename.path
+ end as event_data
+ from rhnserveraction left outer join rhnactionerrataupdate
+ on rhnserveraction.action_id = rhnactionerrataupdate.action_id
+ left outer join rhnactionpackage
+ on rhnserveraction.action_id = rhnactionpackage.action_id
+ left outer join rhnpackagename
+ on rhnactionpackage.name_id = rhnpackagename.id
+ left outer join rhnpackageevr
+ on rhnactionpackage.evr_id = rhnpackageevr.id
+ left outer join rhnpackagearch
+ on rhnactionpackage.package_arch_id = rhnpackagearch.id
+ left outer join rhnerrata
+ on rhnactionerrataupdate.errata_id = rhnerrata.id
+ left outer join rhnactionconfigrevision
+ on rhnserveraction.action_id = rhnactionconfigrevision.action_id
+ and rhnserveraction.server_id = rhnactionconfigrevision.server_id
+ left outer join rhnconfigrevision
+ on rhnactionconfigrevision.config_revision_id = rhnconfigrevision.id
+ left outer join rhnconfigfile
+ on rhnconfigrevision.config_file_id = rhnconfigfile.id
+ left outer join rhnconfigfilename
+ on rhnconfigfile.config_file_name_id = rhnconfigfilename.id
+ , rhnaction, rhnactiontype, rhnactionstatus
+ where rhnserveraction.action_id = rhnaction.id
+ and rhnaction.action_type = rhnactiontype.id
+ and rhnserveraction.status = rhnactionstatus.id
+ union all
+ select rhnserverhistory.server_id,
+ rhnserverhistory.id,
+ to_char(greatest(created, modified), 'YYYY-MM-DD HH24:MI:SS'),
+ 'Done',
+ case when rhnserverhistory.summary like 'subscribed to channel %' then 'Subscribed to channel'
+ when rhnserverhistory.summary like 'unsubscribed from channel %' then 'Unsubscribed from channel'
+ when rhnserverhistory.summary like 'Updated system release %' then 'Updated system release'
+ else trim(upper(substr(rhnserverhistory.summary, 1, 1)) || substr(rhnserverhistory.summary, 2)) end,
+ case when summary in ( 'added system entitlement ', 'removed system entitlement ') then details
+ when summary like 'subscribed to channel %' then details
+ when summary like 'unsubscribed from channel %' then details
+ when summary like 'Updated system release %' then substr(summary, 24)
+ end
+ from rhnserverhistory
+ ) X
+ order by server_id, time, event_id
+
13 years, 3 months
rel-eng/comps
by Miroslav Suchý
rel-eng/comps/comps-spacewalk-server-fedora13.xml | 7 +++++++
rel-eng/comps/comps-spacewalk-server-fedora14.xml | 7 +++++++
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 7 +++++++
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 7 +++++++
4 files changed, 28 insertions(+)
New commits:
commit f5f62aba853b0ee9315779a0e29ba4d64d0baa8e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Feb 21 09:35:03 2011 +0100
add rhnlib and rhn-client-tools to server composes, because rhnpush require new rhnlib
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora13.xml b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
index 345dcfe..4fa354e 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora13.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
@@ -11,6 +11,13 @@
<description>Spacewalk Server Packages</description>
<uservisible>true</uservisible>
<packagelist>
+<!-- client libs - needed till it get propagated to distribuitions -->
+ <packagereq type="default">rhnlib</packagereq>
+ <packagereq type="default">rhn-check</packagereq>
+ <packagereq type="default">rhn-setup</packagereq>
+ <packagereq type="default">rhn-setup-gnome</packagereq>
+ <packagereq type="default">rhn-client-tools</packagereq>
+
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">heirloom-pkgtools</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora14.xml b/rel-eng/comps/comps-spacewalk-server-fedora14.xml
index 76a3c67..8174f5e 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora14.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora14.xml
@@ -11,6 +11,13 @@
<description>Spacewalk Server Packages</description>
<uservisible>true</uservisible>
<packagelist>
+<!-- client libs - needed till it get propagated to distribuitions -->
+ <packagereq type="default">rhnlib</packagereq>
+ <packagereq type="default">rhn-check</packagereq>
+ <packagereq type="default">rhn-setup</packagereq>
+ <packagereq type="default">rhn-setup-gnome</packagereq>
+ <packagereq type="default">rhn-client-tools</packagereq>
+
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">heirloom-pkgtools</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index bfd2496..60807d1 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -11,6 +11,13 @@
<description>Spacewalk Server Packages</description>
<uservisible>true</uservisible>
<packagelist>
+<!-- client libs - needed till it get propagated to distribuitions -->
+ <packagereq type="default">rhnlib</packagereq>
+ <packagereq type="default">rhn-check</packagereq>
+ <packagereq type="default">rhn-setup</packagereq>
+ <packagereq type="default">rhn-setup-gnome</packagereq>
+ <packagereq type="default">rhn-client-tools</packagereq>
+
<packagereq type="default">asm</packagereq>
<packagereq type="default">bea-stax</packagereq>
<packagereq type="default">bea-stax-api</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index 722fab6..0d08df3 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -11,6 +11,13 @@
<description>Spacewalk Server Packages</description>
<uservisible>true</uservisible>
<packagelist>
+<!-- client libs - needed till it get propagated to distribuitions -->
+ <packagereq type="default">rhnlib</packagereq>
+ <packagereq type="default">rhn-check</packagereq>
+ <packagereq type="default">rhn-setup</packagereq>
+ <packagereq type="default">rhn-setup-gnome</packagereq>
+ <packagereq type="default">rhn-client-tools</packagereq>
+
<packagereq type="default">chameleon</packagereq>
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">eventReceivers</packagereq>
13 years, 3 months
java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 87078caea11ed05d7438a6c19338985ec0ea496f
Author: Luc de Louw <luc(a)delouw.ch>
Date: Sun Feb 20 15:32:45 2011 +0100
Typo in the log message
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java
index f0e8809..3ce591f 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java
@@ -126,7 +126,7 @@ public class RpmRepositoryWriter extends RepositoryWriter {
checksumLabel = "sha";
}
- log.info("Generating new repository metatada for channel '" +
+ log.info("Generating new repository metadata for channel '" +
channel.getLabel() + "'(" + this.checksumtype + ") " +
channel.getPackageCount() + " packages, " +
channel.getErrataCount() + " errata");
13 years, 3 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 401263cd7e7a3bfc16566c4668ec05e0d2aab20c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Feb 18 18:09:28 2011 +0100
fix testGetSubscribedBaseChannel test
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
index 2009fb4..0f7a0f5 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
@@ -1987,7 +1987,7 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
public void testGetSubscribedBaseChannel() throws Exception {
Server srv1 = ServerFactoryTest.createTestServer(regular, true,
ServerConstants.getServerGroupTypeProvisioningEntitled());
- Channel base = handler.getSubscribedBaseChannel(adminKey,
+ Channel base = (Channel) handler.getSubscribedBaseChannel(adminKey,
new Integer(srv1.getId().intValue()));
assertEquals(srv1.getBaseChannel(), base);
13 years, 3 months