Changes to 'refs/tags/spacewalk-reports-1.9.3-1'
by Tomáš Kašpárek
Tag 'spacewalk-reports-1.9.3-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-01-28 14:15 +0000
Tagging package [spacewalk-reports] version [1.9.3-1] in directory [reporting/].
Changes since osad-5.11.15-1:
Tomas Kasparek (2):
237581 - OSAD status report
Automatic commit of package [spacewalk-reports] release [1.9.3-1].
---
rel-eng/packages/spacewalk-reports | 2 +-
reporting/reports/data/inventory | 4 +++-
reporting/spacewalk-reports.spec | 5 ++++-
3 files changed, 8 insertions(+), 3 deletions(-)
---
11 years, 2 months
rel-eng/packages reporting/spacewalk-reports.spec
by Tomáš Kašpárek
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-reports.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9325aa84b8883a8b76732e29cf5a90dc787cf3a1
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jan 28 15:15:05 2013 +0100
Automatic commit of package [spacewalk-reports] release [1.9.3-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index 0996154..59716ce 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.9.2-1 reporting/
+1.9.3-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index fabab25..d8f5251 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.9.2
+Version: 1.9.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING
%changelog
+* Mon Jan 28 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.9.3-1
+- 237581 - OSAD status report
+
* Tue Jan 22 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.9.2-1
- 768074 - report of package upgrades available for systems
(tkasparek(a)redhat.com)
11 years, 2 months
reporting/reports
by Tomáš Kašpárek
reporting/reports/data/inventory | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 4dee5b77fc78814901cc0c68eafd0798b1b89754
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jan 28 15:00:59 2013 +0100
237581 - OSAD status report
diff --git a/reporting/reports/data/inventory b/reporting/reports/data/inventory
index 3862c8a..6ec3185 100755
--- a/reporting/reports/data/inventory
+++ b/reporting/reports/data/inventory
@@ -29,6 +29,7 @@ columns:
virtual_host:i System identifier of host, if system is a guest
architecture Architecture of the system
is_virtualized Information whether system is virtualized or not
+ osad_status OSAD status
hardware Hardware information
multival_columns:
@@ -46,7 +47,7 @@ sql:
registration_time, last_checkin_time, kernel_version,
packages_out_of_date, errata_out_of_date,
software_channel, configuration_channel,
- entitlements, system_group, organization, virtual_host, architecture, is_virtualized, hardware
+ entitlements, system_group, organization, virtual_host, architecture, is_virtualized, osad_status, hardware
from (
select rhnserver.id as server_id, rhnserver.name as profile_name,
rhnservernetwork.hostname, trim(rhnservernetwork.ipaddr) as ip_address,
@@ -77,6 +78,7 @@ sql:
) as architecture,
(case when (select rhnVirtualInstance.virtual_system_id from rhnVirtualInstance where rhnVirtualInstance.virtual_system_id=rhnserver.id) is null then 'No' else 'Yes' end
) as is_virtualized,
+ (nvl((select rhnpushclientstate.label from rhnpushclient join rhnpushclientstate on rhnpushclient.state_id=rhnpushclientstate.id where rhnpushclient.server_id=rhnServer.id), 'Not enabled')) as osad_status,
get_hw_info_as_clob(rhnserver.id, '; ') as hardware
from rhnserver left outer join
(
11 years, 2 months
Changes to 'refs/tags/osad-5.11.15-1'
by Jan Pazdziora
Tag 'osad-5.11.15-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-28 12:55 +0000
Tagging package [osad] version [5.11.15-1] in directory [client/tools/osad/].
Changes since spacewalk-schema-1.9.21-1:
Jan Pazdziora (2):
Reimplement anonymous block with update or insert.
Automatic commit of package [osad] release [5.11.15-1].
---
client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/osa_dispatcher.py | 21 +++++++++------------
rel-eng/packages/osad | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
---
11 years, 2 months
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5d737031196aa8b45fb88c534ecb288dbb3a926d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 28 13:55:15 2013 +0100
Automatic commit of package [osad] release [5.11.15-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index c5f204a..14cfcd6 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.11.14
+Version: 5.11.15
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -350,6 +350,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Mon Jan 28 2013 Jan Pazdziora 5.11.15-1
+- Reimplement anonymous block with update or insert.
+
* Mon Dec 10 2012 Jan Pazdziora 5.11.14-1
- 836984 - fixes the permissions on /var/log/osad log file
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index fa0b4f3..7e97803 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.14-1 client/tools/osad/
+5.11.15-1 client/tools/osad/
11 years, 2 months
client/tools
by Jan Pazdziora
client/tools/osad/src/osa_dispatcher.py | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
New commits:
commit b8ff81ffb46d9d9ac809ba56f9674db41c997226
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 28 13:54:20 2013 +0100
Reimplement anonymous block with update or insert.
diff --git a/client/tools/osad/src/osa_dispatcher.py b/client/tools/osad/src/osa_dispatcher.py
index 09f6bfb..7009a16 100644
--- a/client/tools/osad/src/osa_dispatcher.py
+++ b/client/tools/osad/src/osa_dispatcher.py
@@ -268,29 +268,26 @@ class Runner(jabber_lib.Runner):
return row['id']
- _query_register_dispatcher = rhnSQL.Statement("""
- declare
- i numeric;
- begin
+ _query_update_register_dispatcher = rhnSQL.Statement("""
update rhnPushDispatcher
set last_checkin = current_timestamp,
hostname = :hostname_in,
port = :port_in
where jabber_id = :jabber_id_in
- returning id into i;
- if i is null then
- -- Have to insert the row
+ """)
+ _query_insert_register_dispatcher = rhnSQL.Statement("""
insert into rhnPushDispatcher
(id, jabber_id, last_checkin, hostname, port, password)
values (sequence_nextval('rhn_pushdispatch_id_seq'), :jabber_id_in, current_timestamp,
- :hostname_in, :port_in, :password_in);
- end if;
- end;
+ :hostname_in, :port_in, :password_in)
""")
def _register_dispatcher(self, jabber_id, hostname, port):
- h = rhnSQL.prepare(self._query_register_dispatcher, params = ( 'hostname_in varchar', 'port_in numeric', 'jabber_id_in varchar', 'password_in varchar' ))
- h.execute(jabber_id_in=jabber_id, hostname_in=hostname, port_in=port, password_in=self._password)
+ h = rhnSQL.prepare(self._query_update_register_dispatcher)
+ rowcount = h.execute(jabber_id_in=jabber_id, hostname_in=hostname, port_in=port, password_in=self._password)
+ if not rowcount:
+ h = rhnSQL.prepare(self._query_insert_register_dispatcher)
+ h.execute(jabber_id_in=jabber_id, hostname_in=hostname, port_in=port, password_in=self._password)
rhnSQL.commit()
_query_get_client_jids = rhnSQL.Statement("""
11 years, 2 months
Changes to 'refs/tags/spacewalk-schema-1.9.21-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.9.21-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-28 11:52 +0000
Tagging package [spacewalk-schema] version [1.9.21-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.9.20-1:
Jan Pazdziora (2):
Fixing PL/SQL parameter usage.
Automatic commit of package [spacewalk-schema] release [1.9.21-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/oracle/packages/rhn_channel.pkb | 8 ++++----
schema/spacewalk/postgres/packages/rhn_channel.pkb | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.oracle | 8 ++++----
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.postgresql | 2 +-
6 files changed, 15 insertions(+), 12 deletions(-)
---
11 years, 2 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6d9e8e3191e5504688b1448d084406e2dc190831
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 28 12:52:31 2013 +0100
Automatic commit of package [spacewalk-schema] release [1.9.21-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 387e5ef..e394c8b 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.9.20-1 schema/spacewalk/
+1.9.21-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 06778e7..c930125 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.9.20
+Version: 1.9.21
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Mon Jan 28 2013 Jan Pazdziora 1.9.21-1
+- Fixing PL/SQL parameter usage.
+
* Fri Jan 25 2013 Jan Pazdziora 1.9.20-1
- Adding the .sql suffix so that the file gets processed during upgrade.
11 years, 2 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/oracle/packages/rhn_channel.pkb | 8 ++++----
schema/spacewalk/postgres/packages/rhn_channel.pkb | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.oracle | 8 ++++----
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.postgresql | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 4a0fc40fae5feb0af43f2b45f5a6f4e686514a07
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 28 12:51:40 2013 +0100
Fixing PL/SQL parameter usage.
Addressing
1210/40 PLS-00049: bad bind variable 'PATH_IN'
1211/49 PLS-00049: bad bind variable 'TIMESTAMP_IN'
1216/28 PLS-00049: bad bind variable 'CHANNEL_ID_IN'
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index fdc538c..325c18a 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -1223,15 +1223,15 @@ IS
from rhnChannelComps
where channel_id = channel_id_in
) loop
- if row.relative_filename = :path_in
- and row.last_modified = to_date(:timestamp_in, 'YYYYMMDDHH24MISS') then
+ if row.relative_filename = path_in
+ and row.last_modified = to_date(timestamp_in, 'YYYYMMDDHH24MISS') then
return;
end if;
end loop;
delete from rhnChannelComps
- where channel_id = :channel_id_in;
+ where channel_id = channel_id_in;
insert into rhnChannelComps (id, channel_id, relative_filename, last_modified, created, modified)
- values (sequence_nextval('rhn_channelcomps_id_seq'), :channel_id_in, :path_in, to_date(:timestamp_in, 'YYYYMMDDHH24MISS'), current_timestamp, current_timestamp);
+ values (sequence_nextval('rhn_channelcomps_id_seq'), channel_id_in, path_in, to_date(timestamp_in, 'YYYYMMDDHH24MISS'), current_timestamp, current_timestamp);
end set_comps;
END rhn_channel;
diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb
index b2695e0..11ff70e 100644
--- a/schema/spacewalk/postgres/packages/rhn_channel.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 7e97503a35113f4e3165b79c8bf2d41b7a75afe2
+-- oracle equivalent source sha1 e6fa92f40cfb0ac1645f53ecad5f2a8f99a616f7
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.oracle
index fdc538c..325c18a 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.oracle
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.oracle
@@ -1223,15 +1223,15 @@ IS
from rhnChannelComps
where channel_id = channel_id_in
) loop
- if row.relative_filename = :path_in
- and row.last_modified = to_date(:timestamp_in, 'YYYYMMDDHH24MISS') then
+ if row.relative_filename = path_in
+ and row.last_modified = to_date(timestamp_in, 'YYYYMMDDHH24MISS') then
return;
end if;
end loop;
delete from rhnChannelComps
- where channel_id = :channel_id_in;
+ where channel_id = channel_id_in;
insert into rhnChannelComps (id, channel_id, relative_filename, last_modified, created, modified)
- values (sequence_nextval('rhn_channelcomps_id_seq'), :channel_id_in, :path_in, to_date(:timestamp_in, 'YYYYMMDDHH24MISS'), current_timestamp, current_timestamp);
+ values (sequence_nextval('rhn_channelcomps_id_seq'), channel_id_in, path_in, to_date(timestamp_in, 'YYYYMMDDHH24MISS'), current_timestamp, current_timestamp);
end set_comps;
END rhn_channel;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.postgresql
index 6ff388e..69df5ee 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 7e97503a35113f4e3165b79c8bf2d41b7a75afe2
+-- oracle equivalent source sha1 e6fa92f40cfb0ac1645f53ecad5f2a8f99a616f7
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
11 years, 2 months
Changes to 'refs/tags/spacewalk-schema-1.9.20-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.9.20-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-25 13:10 +0000
Tagging package [spacewalk-schema] version [1.9.20-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.9.19-1:
Jan Pazdziora (2):
Adding the .sql suffix so that the file gets processed during upgrade.
Automatic commit of package [spacewalk-schema] release [1.9.20-1].
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/010-rhn_channel.pks.oracle | 149 -
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/010-rhn_channel.pks.postgresql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/010-rhn_channel.pks.sql.oracle | 149 +
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/010-rhn_channel.pks.sql.postgresql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.oracle | 1239 ----------
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.postgresql | 47
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.oracle | 1239 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/011-rhn_channel.pkb.sql.postgresql | 47
10 files changed, 1442 insertions(+), 1439 deletions(-)
---
11 years, 2 months