rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 31c97da9643133e24d6f4de290aa0830ee3cc037
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 11 13:39:33 2011 +0200
Automatic commit of package [spacewalk-web] release [1.6.12-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index da0eda1..286cfa4 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.11-1 web/
+1.6.12-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 5d42c90..e814942 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.11
+Version: 1.6.12
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Aug 11 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.12-1
+- fixed couple more joins
+- removed typo parenthesis
+
* Wed Aug 10 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.11-1
- COALESCE works in both db backends
12 years, 10 months
2 commits - web/modules
by Michael Mraka
web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml | 4 +-
web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml | 15 +++++-----
2 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 254c57fd69bb9a14c17d7de2deddb304caf26b54
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 11 13:32:49 2011 +0200
fixed couple more joins
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
index c7715b0..35e37e2 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
@@ -18,24 +18,24 @@ SELECT CR.id AS ID,
CFT.name as FILETYPE
FROM rhnConfigChannelType CCT,
rhnConfigChannel CC,
- rhnConfigContent CCon,
rhnConfigFileName CFN,
rhnConfigFile CF,
- rhnConfigRevision CR,
rhnServerConfigChannel SCC,
rhnConfigFileType CFT,
- rhnChecksum Csum
+ rhnConfigRevision CR
+ LEFT JOIN rhnConfigContent CCon
+ ON CR.config_content_id = CCon.id
+ LEFT JOIN rhnChecksum Csum
+ ON CCon.checksum_id = Csum.id
WHERE SCC.server_id = :sid
AND SCC.config_channel_id = CF.config_channel_id
AND CF.id = CR.config_file_id
AND CF.config_file_name_id = CFN.id
AND CF.config_channel_id = CC.id
AND CC.confchan_type_id = CCT.id
- AND CR.config_content_id = CCon.id (+)
AND CF.latest_config_revision_id = CR.id
AND CCT.label in ('normal', 'local_override')
AND CR.config_file_type_id = CFT.id
- AND CCon.checksum_id = Csum.id(+)
ORDER BY CCT.priority, SCC.position
</query>
<elaborator params="sid" multiple="t">
@@ -152,13 +152,14 @@ ORDER BY UPPER(CFN.path)
<query params="sid, aid">
SELECT CFN.path,
CFF.name AS FAILURE_REASON
- FROM rhnConfigFileFailure CFF,
+ FROM
rhnConfigFileName CFN,
rhnActionConfigFileName ACFN
+ LEFT JOIN rhnConfigFileFailure CFF
+ AND ACFN.failure_id = CFF.id
WHERE ACFN.server_id = :sid
AND ACFN.action_id = :aid
AND ACFN.config_file_name_id = CFN.id
- AND ACFN.failure_id = CFF.id (+)
ORDER BY CFN.path
</query>
</mode>
commit baec14fac326204ab8f6b580add6b80f878dbfe1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 11 12:02:32 2011 +0200
removed typo parenthesis
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
index 01244da..c928831 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
@@ -45,7 +45,7 @@ SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
WHEN 3 THEN 'UNKNOWN'
WHEN 4 THEN 'WARNING'
WHEN 5 THEN 'CRITICAL'
- END) ST
+ END as ST
FROM rhn_probe_state PS, rhnServerGroupMembership SGM
LEFT JOIN rhn_check_probe CP
ON SGM.server_id = CP.host_id
@@ -92,7 +92,7 @@ SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
WHEN 3 THEN 'UNKNOWN'
WHEN 4 THEN 'WARNING'
WHEN 5 THEN 'CRITICAL'
- END) ST
+ END as ST
FROM rhn_probe_state PS, rhnServerGroupMembership SGM
LEFT JOIN rhn_check_probe CP
ON SGM.server_id = CP.host_id
12 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.6.4-1'
by Tomas Lestach
Tag 'spacewalk-schema-1.6.4-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-08-11 09:33 +0000
Tagging package [spacewalk-schema] version [1.6.4-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.6.19-1:
Tomas Lestach (2):
722189 - rewrite rhnServerNeededView to reflect all available errata
Automatic commit of package [spacewalk-schema] release [1.6.4-1].
---
This | 79 ++--------
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/views/rhnServerNeededView.sql | 2
schema/spacewalk/spacewalk-schema.spec | 6
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/002-rhnServerNeededView.sql | 31 +++
5 files changed, 60 insertions(+), 60 deletions(-)
---
12 years, 10 months
2 commits - rel-eng/packages schema/spacewalk
by Tomas Lestach
This | 79 ++--------
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/views/rhnServerNeededView.sql | 2
schema/spacewalk/spacewalk-schema.spec | 6
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/002-rhnServerNeededView.sql | 31 +++
5 files changed, 60 insertions(+), 60 deletions(-)
New commits:
commit 1a80311ee8f169d31d0ee9a6385ff7ac3177c44f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 11 11:33:32 2011 +0200
Automatic commit of package [spacewalk-schema] release [1.6.4-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 8e1063a..0b95ca4 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.3-1 schema/spacewalk/
+1.6.4-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 9d65a0b..e93b306 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.6.3
+Version: 1.6.4
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Aug 11 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.4-1
+- 722189 - rewrite rhnServerNeededView to reflect all available errata
+ (tlestach(a)redhat.com)
+
* Wed Aug 10 2011 Jan Pazdziora 1.6.3-1
- We missed ON DELETE CASCADE in the past schema upgrade scripts -- fixing now.
commit 0679ccfd39e5a3118c9eac10e33d8407bd3cfc92
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 10 16:44:53 2011 +0200
722189 - rewrite rhnServerNeededView to reflect all available errata
not only those with associated latest pacakages
diff --git a/schema/spacewalk/common/views/rhnServerNeededView.sql b/schema/spacewalk/common/views/rhnServerNeededView.sql
index ee10e96..3655574 100644
--- a/schema/spacewalk/common/views/rhnServerNeededView.sql
+++ b/schema/spacewalk/common/views/rhnServerNeededView.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2010 Red Hat, Inc.
+-- Copyright (c) 2008-2011 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -14,10 +14,9 @@
--
--- A view that displays packages which can be updated on selected client.
--- This is an uncached version of rhnServerNeededCache.
+-- A view that displays an uncached version of rhnServerNeededCache
-create or replace view
+CREATE OR REPLACE VIEW
rhnServerNeededView
(
org_id,
@@ -27,60 +26,24 @@ rhnServerNeededView
package_name_id,
channel_id
)
-as
-select s.org_id,
- s.id as server_id,
- pce.errata_id,
- pkg.id as package_id,
- neededpkg.name_id as package_name_id,
- scp.min_channel_id as channel_id
- from (select sc.server_id, np.name_id, np.package_arch_id, max(np.evr) max_evr
- from (-- list of newest packages in channels with EVR
- select np_np.*, np_pe.evr
- from rhnChannelNewestPackage np_np
- join rhnPackageEVR np_pe
- on np_pe.id = np_np.evr_id) np
- join (-- list of packages on the server with EVR
- select sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id, max(sp_pe.evr) as max_evr
- from rhnServerPackage sp_sp
- join rhnPackageEVR sp_pe
- on sp_pe.id = sp_sp.evr_id
- group by sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id) sp
- on -- at first - we want only newer (=higher EVR) packages than there are on the server
- sp.name_id = np.name_id and sp.max_evr < np.evr
- join -- secondly - packages must be upgrade compatible
- rhnPackageUpgradeArchCompat puac
- on puac.package_arch_id = sp.package_arch_id and puac.package_upgrade_arch_id = np.package_arch_id
- join -- thirdly - packages must be in channel where server is subscribed to
- rhnServerChannel sc
- on sc.server_id = sp.server_id and sc.channel_id = np.channel_id
- group by sc.server_id, np.name_id, np.package_arch_id
- ) neededpkg
- join -- lookup org_id by server
- rhnServer s
- on neededpkg.server_id = s.id
- join (--lookup package_id by max_evr, name and package_arch
- select p.*, p_evr.evr
- --
- , p_evr.release, p_evr.version, p_evr.epoch
- from rhnPackage p
- join rhnPackageEVR p_evr
- on p_evr.id = p.evr_id) pkg
- on pkg.evr = neededpkg.max_evr
- and pkg.name_id = neededpkg.name_id
- and pkg.package_arch_id = neededpkg.package_arch_id
- join (-- lookup channel_id - we want only one id eve if package is in more channels
- -- so pick lowest one
- select cp.package_id, csc.server_id, min(cp.channel_id) as min_channel_id
- from rhnChannelPackage cp
- join rhnServerChannel csc
- on csc.channel_id = cp.channel_id
- group by cp.package_id, csc.server_id) scp
- on scp.package_id = pkg.id and scp.server_id = neededpkg.server_id
- left join (-- lookup errata id (can be NULL)
- select ep.package_id, ce.errata_id, ce.channel_id
- from rhnErrataPackage ep
- join rhnChannelErrata ce
- on ce.errata_id = ep.errata_id) pce
- on pce.package_id = pkg.id and pce.channel_id = scp.min_channel_id
+AS
+SELECT s.org_id,
+ sp.server_id,
+ x.errata_id,
+ up.id,
+ up.name_id,
+ x.channel_id
+ FROM rhnServer s
+ join rhnServerPackage sp ON sp.server_id = s.id
+ join rhnPackageEvr pe ON pe.id = sp.evr_id
+ join rhnPackage up ON up.name_id = sp.name_id
+ join rhnPackageEvr upe ON upe.id = up.evr_id AND pe.evr < upe.evr
+ join rhnPackageUpgradeArchCompat puac ON puac.package_arch_id = sp.package_arch_id AND puac.package_upgrade_arch_id = up.package_arch_id
+ join rhnServerChannel sc ON sc.server_id = sp.server_id
+ join rhnChannelPackage cp ON cp.package_id = up.id AND cp.channel_id = sc.channel_id
+ left join
+ (SELECT ep.errata_id, cp.channel_id, ep.package_id
+ FROM rhnChannelErrata cp
+ join rhnErrataPackage ep ON ep.errata_id = cp.errata_id) x
+ ON x.channel_id = sc.channel_id AND x.package_id = cp.package_id
;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/002-rhnServerNeededView.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/002-rhnServerNeededView.sql
new file mode 100644
index 0000000..5223497
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/002-rhnServerNeededView.sql
@@ -0,0 +1,31 @@
+CREATE OR REPLACE VIEW
+rhnServerNeededView
+(
+ org_id,
+ server_id,
+ errata_id,
+ package_id,
+ package_name_id,
+ channel_id
+)
+AS
+SELECT s.org_id,
+ sp.server_id,
+ x.errata_id,
+ up.id,
+ up.name_id,
+ x.channel_id
+ FROM rhnServer s
+ join rhnServerPackage sp ON sp.server_id = s.id
+ join rhnPackageEvr pe ON pe.id = sp.evr_id
+ join rhnPackage up ON up.name_id = sp.name_id
+ join rhnPackageEvr upe ON upe.id = up.evr_id AND pe.evr < upe.evr
+ join rhnPackageUpgradeArchCompat puac ON puac.package_arch_id = sp.package_arch_id AND puac.package_upgrade_arch_id = up.package_arch_id
+ join rhnServerChannel sc ON sc.server_id = sp.server_id
+ join rhnChannelPackage cp ON cp.package_id = up.id AND cp.channel_id = sc.channel_id
+ left join
+ (SELECT ep.errata_id, cp.channel_id, ep.package_id
+ FROM rhnChannelErrata cp
+ join rhnErrataPackage ep ON ep.errata_id = cp.errata_id) x
+ ON x.channel_id = sc.channel_id AND x.package_id = cp.package_id
+;
12 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.6.19-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.6.19-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-11 08:27 +0000
Tagging package [spacewalk-java] version [1.6.19-1] in directory [java/].
Changes since perl-NOCpulse-ProcessPool-1.6.1-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.6.19-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 10 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4d0e1540c85cde18ce8ce6003c9072e137ab8c28
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 11 10:27:22 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.19-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 139f090..3dbf539 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.6.18
+Version: 1.6.19
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Aug 11 2011 Jan Pazdziora 1.6.19-1
+- 728638 - Fixed kickstart.profile.setAdvancedOptions() to renderize the
+ kickstart after invocating method. (mmello(a)redhat.com)
+
* Sun Aug 07 2011 Jan Pazdziora 1.6.18-1
- Silencing checkstyle.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e70fac0..0affcc2 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.18-1 java/
+1.6.19-1 java/
12 years, 10 months
Changes to 'refs/tags/perl-NOCpulse-ProcessPool-1.6.1-1'
by Jan Pazdziora
Tag 'perl-NOCpulse-ProcessPool-1.6.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-11 08:26 +0000
Tagging package [perl-NOCpulse-ProcessPool] version [1.6.1-1] in directory [monitoring/PerlModules/NP/ProcessPool/].
Changes since perl-NOCpulse-Probe-1.184.10-1:
Jan Pazdziora (1):
Automatic commit of package [perl-NOCpulse-ProcessPool] release [1.6.1-1].
---
monitoring/PerlModules/NP/ProcessPool/perl-NOCpulse-ProcessPool.spec | 5 ++++-
rel-eng/packages/perl-NOCpulse-ProcessPool | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 10 months
monitoring/PerlModules rel-eng/packages
by Jan Pazdziora
monitoring/PerlModules/NP/ProcessPool/perl-NOCpulse-ProcessPool.spec | 5 ++++-
rel-eng/packages/perl-NOCpulse-ProcessPool | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 3c29cfbfa77f15895ecfd472aed085a70766eac9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 11 10:26:49 2011 +0200
Automatic commit of package [perl-NOCpulse-ProcessPool] release [1.6.1-1].
diff --git a/monitoring/PerlModules/NP/ProcessPool/perl-NOCpulse-ProcessPool.spec b/monitoring/PerlModules/NP/ProcessPool/perl-NOCpulse-ProcessPool.spec
index 8beb8c4..dddc49f 100644
--- a/monitoring/PerlModules/NP/ProcessPool/perl-NOCpulse-ProcessPool.spec
+++ b/monitoring/PerlModules/NP/ProcessPool/perl-NOCpulse-ProcessPool.spec
@@ -1,5 +1,5 @@
Name: perl-NOCpulse-ProcessPool
-Version: 1.6.0
+Version: 1.6.1
Release: 1%{?dist}
Summary: Perl implementation of a process pool
URL: https://fedorahosted.org/spacewalk
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/NOCpulse/*
%changelog
+* Thu Aug 11 2011 Jan Pazdziora 1.6.1-1
+- Localization of STDOUT and STDERR was overoptimistic.
+
* Fri Feb 18 2011 Jan Pazdziora 1.4.1-1
- Localize the filehandle globs; also use three-parameter opens.
diff --git a/rel-eng/packages/perl-NOCpulse-ProcessPool b/rel-eng/packages/perl-NOCpulse-ProcessPool
index 10572b6..5b00041 100644
--- a/rel-eng/packages/perl-NOCpulse-ProcessPool
+++ b/rel-eng/packages/perl-NOCpulse-ProcessPool
@@ -1 +1 @@
-1.4.1-1 monitoring/PerlModules/NP/ProcessPool/
+1.6.1-1 monitoring/PerlModules/NP/ProcessPool/
12 years, 10 months
Changes to 'refs/tags/perl-NOCpulse-Probe-1.184.10-1'
by Jan Pazdziora
Tag 'perl-NOCpulse-Probe-1.184.10-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-11 08:26 +0000
Tagging package [perl-NOCpulse-Probe] version [1.184.10-1] in directory [monitoring/PerlModules/NP/Probe/].
Changes since perl-NOCpulse-OracleDB-1.28.21-1:
Jan Pazdziora (1):
Automatic commit of package [perl-NOCpulse-Probe] release [1.184.10-1].
---
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 5 ++++-
rel-eng/packages/perl-NOCpulse-Probe | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 10 months
Changes to 'refs/tags/perl-NOCpulse-OracleDB-1.28.21-1'
by Jan Pazdziora
Tag 'perl-NOCpulse-OracleDB-1.28.21-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-11 08:25 +0000
Tagging package [perl-NOCpulse-OracleDB] version [1.28.21-1] in directory [monitoring/PerlModules/NP/OracleDB/].
Changes since SatConfig-cluster-1.54.10-1:
Jan Pazdziora (1):
Automatic commit of package [perl-NOCpulse-OracleDB] release [1.28.21-1].
---
monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec | 5 ++++-
rel-eng/packages/perl-NOCpulse-OracleDB | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 10 months