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 275d56730389d889e3da336ab453a0759ab9d9e9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 25 10:41:21 2011 +0100
Automatic commit of package [osad] release [5.10.26-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 2e7293e..74bcb06 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.10.25
+Version: 5.10.26
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -275,6 +275,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Fri Nov 25 2011 Jan Pazdziora 5.10.26-1
+- The update_client_message_sent method is not used, removing.
+
* Fri Nov 04 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 5.10.25-1
- 679335 - store osa-dispatcher jabber password in DB
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index aa2b018..4d392cc 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.25-1 client/tools/osad/
+5.10.26-1 client/tools/osad/
12 years, 5 months
client/tools
by Jan Pazdziora
client/tools/osad/src/dispatcher_client.py | 13 -------------
1 file changed, 13 deletions(-)
New commits:
commit a08b86d18013680df7adb1c42bb987297059d159
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 25 10:40:54 2011 +0100
The update_client_message_sent method is not used, removing.
diff --git a/client/tools/osad/src/dispatcher_client.py b/client/tools/osad/src/dispatcher_client.py
index fc0f98e..1e100ee 100644
--- a/client/tools/osad/src/dispatcher_client.py
+++ b/client/tools/osad/src/dispatcher_client.py
@@ -203,19 +203,6 @@ class Client(jabber_lib.JabberClient):
if ret:
rhnSQL.commit()
- _query_update_client_message_sent = rhnSQL.Statement("""
- update rhnPushClient
- set next_action_time = sysdate + :delta / 86400
- where jabber_id = :jid
- """)
- def update_client_message_sent(self, jid):
- jid = str(jid)
- h = rhnSQL.prepare(self._query_update_client_message_sent)
- delta = 10
- ret = h.execute(delta=delta, jid=jid)
- if ret:
- rhnSQL.commit()
-
class InvalidClientError(Exception):
pass
12 years, 5 months
Branch 'ipv6-rebased' - schema/spacewalk
by Miroslav Suchý
schema/spacewalk/postgres/triggers/rhnServerNetInterface.sql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.postgresql | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 08bd4aa1d6afe233e46bcb4585f733208665d8d1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Nov 25 09:26:56 2011 +0100
IPv6: fix sha1sums for oracle equivalent
diff --git a/schema/spacewalk/postgres/triggers/rhnServerNetInterface.sql b/schema/spacewalk/postgres/triggers/rhnServerNetInterface.sql
index 192308f..2bf65a1 100644
--- a/schema/spacewalk/postgres/triggers/rhnServerNetInterface.sql
+++ b/schema/spacewalk/postgres/triggers/rhnServerNetInterface.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 1c9678fc0e82b0d0e1f659358120c971bc9bda20
+-- oracle equivalent source sha1 0464a691edf6642483856cc6cce5049fc2b25ca9
create or replace function rhn_srv_net_iface_mod_trig_fun() returns trigger as
$$
begin
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql
index 17fbb81..f15b5c9 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 6e90408fc4c3d072bf407d0eb18962e46cb6a860
+-- oracle equivalent source sha1 fa9bb2ceca325001a9ea1d2776b8472cbbfb16ee
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
--
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql
index 2af5108..be61cb5 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 6a538f3b05d412810baec118fbb7860348c60cd4
+-- oracle equivalent source sha1 a1d56fbb4429cefecff7ef670556ddd88072e610
create or replace function get_hw_info_as_clob(
sid in rhnserver.id%TYPE,
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql
index 296d356..473e0d5 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 a3c3cb4940f2e96320a833521f352b83ddddaed1
+-- oracle equivalent source sha1 1ea0fa0493bd58e3cff2b3a8f6294710e77f4d0b
create or replace function rhn_srv_net_iface_mod_trig_fun() returns trigger as
$$
begin
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.postgresql
index eaca4a9..a7e35c1 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 9cf5504d7dabce531f966048916bf85ce13e43ed
+-- oracle equivalent source sha1 061451bfe6e3c20f6a56e6844336f10007f7eebd
DROP INDEX rhn_cpu_server_id_idx;
12 years, 5 months
Changes to 'ipv6-rebased'
by Miroslav Suchý
New branch 'ipv6-rebased' available with the following commits:
commit f71ed55370d3173984df588f3742eb5a5f7b8003
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 24 14:48:59 2011 +0100
IPv6: reporting - make inventory report IPv6 aware
commit a71cdce588f3fe7658e209b5a556a4e7a3599f51
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 24 14:36:25 2011 +0100
IPv6: reporting - make errata-systems report IPv6 aware
commit d624945999bb8d68e2075d268b402f960ec0aa2a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 23 16:22:12 2011 +0100
IPv6: filter out params, which are not used in query
addressing:
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 123, in call_function
response = apply(func, params)
File "/usr/share/rhn/server/handlers/xmlrpc/registration.py", line 999, in refresh_hw_profile
server.save_hardware()
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_wrapper.py", line 90, in save_hardware
ret = self.save_hardware_byid(self.server["id"])
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 917, in save_hardware_byid
hw.save(sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 473, in save
info['ipv6'].save(self.get_server_id(server_id, name))
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 635, in save
self._delete(deletes)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 657, in _delete
return _dml(h, params)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 742, in _dml
rowcount = apply(statement.executemany, (), params)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnSQL/sql_base.py", line 172, in executemany
return apply(self._execute_wrapper, (self._executemany, ) + p, kw)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py", line 108, in _execute_wrapper
retval = apply(function, p, kw)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py", line 208, in _executemany
self._real_cursor.executemany(None, arr)
SQLError: (1036, 'ORA-01036: illegal variable name/number\n', 'delete from rhnServerNetAddress6 where interface_id =
+:interface_id and address = :address and scope = :scope')
commit 03f7407a66532d4ca7a04fcd5c7bf475ce4a50f1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 23 15:51:19 2011 +0100
IPv6: do not pass to oracle more params then is necessary
oracle binds all parameter it get and if it could match the type to
some SQL type it will raise an error.
Exception Handler Information
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 123, in call_function
response = apply(func, params)
File "/usr/share/rhn/server/handlers/xmlrpc/registration.py", line 999, in refresh_hw_profile
server.save_hardware()
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_wrapper.py", line 90, in save_hardware
ret = self.save_hardware_byid(self.server["id"])
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 913, in save_hardware_byid
hw.save(sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 463, in save
self._update(updates)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 528, in _update
return _dml(h, params)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 738, in _dml
rowcount = apply(statement.executemany, (), params)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnSQL/sql_base.py", line 172, in executemany
return apply(self._execute_wrapper, (self._executemany, ) + p, kw)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py", line 108, in _execute_wrapper
retval = apply(function, p, kw)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py", line 208, in _executemany
self._real_cursor.executemany(None, arr)
SQLError: (None, 'Variable_TypeByValue(): unhandled data type instance', 'update rhnServerNetInterface set hw_addr =
+:hw_addr, module = :module where server_id = :server_id and name = :name')
commit 8d057d8f86a587abf232e98e0dce91e9ac23fefa
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 22 10:53:29 2011 +0100
IPv6: in tables rhnRam, rhnCpu and rhnServerDMI allow only one record per server
Java part of Spacewalk assume only one record per server there.
If there are more records per server tomcat will fail with traceback of
apocalyptic size.
commit fdfe20544e373ff8fdfb09d1b9512aa3f2caf698
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Nov 18 11:50:56 2011 +0100
IPv6: if there is no data, do not try to access it
addressing:
Exception Handler Information
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 123, in call_function
response = apply(func, params)
File "/usr/share/rhn/server/handlers/xmlrpc/registration.py", line 995, in refresh_hw_profile
server.delete_hardware()
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_wrapper.py", line 87, in delete_hardware
return Hardware.delete_hardware(self, self.server.get("id"))
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 865, in delete_hardware
self.reload_hardware_byid(sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 912, in reload_hardware_byid
self.__load_from_db(HardwareDevice, sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 902, in __load_from_db
dev.reload(sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 224, in reload
if self.data.has_key(k):
AttributeError: 'NoneType' object has no attribute 'has_key'
commit 1498152e56be8ec7635c9a4616cc5d500a4a0cd6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 15 14:22:10 2011 +0100
IPv6: do not call constructor in reload
a) it is already called in __load_from_db()
b) we change all attributes later in reload()
c) child of Device class has different parameters of constructor - they accept dictionary of params instead of name of table
addressing:
Exception Handler Information
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 123, in call_function
response = apply(func, params)
File "/usr/share/rhn/server/handlers/xmlrpc/registration.py", line 995, in refresh_hw_profile
server.delete_hardware()
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_wrapper.py", line 87, in delete_hardware
return Hardware.delete_hardware(self, self.server.get("id"))
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 876, in delete_hardware
self.reload_hardware_byid(sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 923, in reload_hardware_byid
self.__load_from_db(HardwareDevice, sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 913, in __load_from_db
dev.reload(sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 220, in reload
self.__init__(self.__table)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 315, in __init__
Device.__init__(self, "rhnDevice", fields, dict, mapping)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 271, in __init__
dict, mapping)
TypeError: ('Argument passed is not a dictionary', 'rhnDevice', {'desc': 'description'})
commit 71d22b81defcbe6b719799060e8b710d8edbe993
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 15 11:40:34 2011 +0100
IPv6: change backend to store IPv6 interfaces into DB
commit defd0b2402a7531b7c2e404eb6b521e63e8c2446
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Oct 25 16:33:51 2011 +0200
IPv6: __load_from_db: load devices using its method save()
this will put _auto_null and other stuff in game
commit 27199fd5312878860f60a2a636bb614eb241af62
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Nov 22 14:52:26 2011 +0100
IPv6: disabled interface - take IPv6 addresses into account
commit 00be3916fbb17565c0c07abb22a25cbfbe08d877
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 18 14:26:38 2011 +0100
IPv6: unit test fixes
commit 1d6e62e92fca90adaf8557612ac5fb9b6742255a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 11 13:11:29 2011 +0100
IPv6: also browse through NIC's IPv6 addresses
commit c46d75fe2f2204abaab6551d8b03ccd186005122
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Nov 10 17:51:48 2011 +0100
IPv6: duplicate system comparison based on IPv6 (webui)
commit 77c4c21f1a9deaf70c493d60915bdceb862e37bd
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Nov 10 16:13:22 2011 +0100
IPv6: find system duplicates based on IPv6
New webui page: systems/DuplicateIPv6List to list duplicate systems
with identical IPv6 addresses.
commit 998f3f358c20b63e680a3759a9df3af25416785d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Nov 10 13:47:22 2011 +0100
IPv6: fix duplicates based on IP comparison
commit 45fa4e772de85903dabbae93ad146405e0151362
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Nov 10 10:19:09 2011 +0100
IPv6: system.getNetworkDevices() modifications (API)
commit fa330dfffd1bfe077b619e8b22d328a4b16ada6b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 9 20:50:30 2011 +0100
api doc: typo fix
commit ff26ab5bd8df750d470d181dba6c4270158e1dc4
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 9 20:43:56 2011 +0100
IPv6: system.getNetwork() modifications (API)
commit 3f701d1e9777b408552593f99890101ef5ddc597
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 9 20:20:32 2011 +0100
IPv6: SystemHardware.do (webui) modifications
commit a96e64a2f5ab36c112364408dc60e1ae9fb4afcd
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 9 18:18:33 2011 +0100
IPv6: update NetworkInterface.*
commit 5cbfb5e9befdd0ca497b134b26e6da68166adaaf
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 9 18:11:15 2011 +0100
IPv6: updated hibernate mappings for network tables
commit e75253cadd1395d0c0a44699c35f2816b0e439c3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 24 15:50:36 2011 +0200
IPv6: insert id from sequence using trigger
commit e56626696d36df87fea79cce15e4c88dc94f9880
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 24 11:07:54 2011 +0200
IPv6: code cleanup - package RHN::DB::Server::NetInterface is not used anymore
commit e16366e83faf02f55603694a277a6eae83ac88f5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 24 11:06:33 2011 +0200
IPv6: code cleanup - function get_net_interfaces is not used anymore
commit ed112bef1b089cab33608a88d4bbd1386ae9f0d4
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 24 11:05:47 2011 +0200
IPv6: code cleanup - function server_network_interfaces is not used anymore
commit 05fb52ecfe35b231d71e79b424107e6b21fb6325
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 24 11:04:27 2011 +0200
IPv6: code cleanup - tag rhn-server-network-interfaces is not used anywhere
commit 1e7286c2375fecc052eaa1338795c9c23a9220c8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Oct 21 10:03:49 2011 +0200
IPv6: get_hw_info_as_clob schema upgrade script
commit 677db2e4d80903daa6f9da3743d57f121470efa3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Oct 21 10:03:03 2011 +0200
IPv6: upgrade script for rhn_server.pkb
commit 7046be78b4153c50ecae89c5e1022a6f591b640a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Oct 20 19:19:02 2011 +0200
IPv6: schema upgrade
commit a7f137a92c51ea9c91df18656e7644ebb94d7199
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Oct 20 18:38:45 2011 +0200
IPv6: get_hw_info_as_clob: adapt to IPv6 changes
commit e0d95b0db8eb2b791aeb531a2c8aa0841a17fb53
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Oct 20 17:48:58 2011 +0200
IPv6: update rhn_server.get_ip_address() to reflect IPv6 changes
commit f91f3647f00cae0e91a6b51f6794ff3be00479a5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Oct 20 12:55:30 2011 +0200
IPv6: schema change
12 years, 5 months
Branch 'ipv6' - 3 commits - reporting/reports schema/spacewalk
by Miroslav Suchý
reporting/reports/data/errata-systems | 6 ++++--
reporting/reports/data/inventory | 8 +++++---
schema/spacewalk/postgres/procs/get_hw_info_as_clob.sql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql | 2 +-
4 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 5f6d018e681a4011704a7dd3a47d050f09064251
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 24 14:48:59 2011 +0100
IPv6: reporting - make inventory report IPv6 aware
diff --git a/reporting/reports/data/inventory b/reporting/reports/data/inventory
index 836b4b4..7d7687b 100755
--- a/reporting/reports/data/inventory
+++ b/reporting/reports/data/inventory
@@ -13,7 +13,8 @@ columns:
server_id:i System identifier
profile_name Profile name, as stored on server
hostname Hostname, as reported by the system
- ip_address IP address, as reported by the system
+ ip_address IPv4 address, as reported by the system
+ ipv6_address IPv6 address, as reported by the system
registered_by User under which the system is registered
registration_time Registration time
last_checkin_time Last checkin time
@@ -40,7 +41,7 @@ multival_columns:
sql:
- select server_id, profile_name, hostname, ip_address, registered_by,
+ select server_id, profile_name, hostname, ip_address, ipv6_address, registered_by,
registration_time, last_checkin_time, kernel_version,
packages_out_of_date, errata_out_of_date,
software_channel, configuration_channel,
@@ -48,6 +49,7 @@ sql:
from (
select rhnserver.id as server_id, rhnserver.name as profile_name,
rhnservernetwork.hostname, trim(rhnservernetwork.ipaddr) as ip_address,
+ trim(rhnservernetwork.ip6addr) as ipv6_address,
( select login from web_contact where rhnserver.creator_id = web_contact.id ) as registered_by,
to_char(rhnserver.created, 'YYYY-MM-DD HH24:MI:SS') as registration_time,
( select to_char(checkin, 'YYYY-MM-DD HH24:MI:SS') from rhnserverinfo where rhnserver.id = server_id ) as last_checkin_time,
@@ -75,7 +77,7 @@ sql:
get_hw_info_as_clob(rhnserver.id, '; ') as hardware
from rhnserver left outer join
(
- select server_id, hostname, ipaddr
+ select server_id, hostname, ipaddr, ip6addr
from rhnservernetwork
where id in (
select min(id)
commit 20edad5ae3a183d0c8e38552cc427b2555098a9c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 24 14:42:22 2011 +0100
IPv6: add missing alias to FROM clausule
diff --git a/schema/spacewalk/postgres/procs/get_hw_info_as_clob.sql b/schema/spacewalk/postgres/procs/get_hw_info_as_clob.sql
index 6cc1982..23549d3 100644
--- a/schema/spacewalk/postgres/procs/get_hw_info_as_clob.sql
+++ b/schema/spacewalk/postgres/procs/get_hw_info_as_clob.sql
@@ -18,7 +18,7 @@ begin
from rhncpu where rhncpu.server_id = sid
union all
select 2, ni.name||' '||coalesce(na4.address,'')||'/'||coalesce(na4.netmask,'')||' '||ni.hw_addr val
- from rhnservernetinterface,
+ from rhnservernetinterface ni,
rhnServerNetAddress4 na4
where ni.server_id = sid
and ni.id = na4.interface_id
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql
index 6cc1982..23549d3 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql
@@ -18,7 +18,7 @@ begin
from rhncpu where rhncpu.server_id = sid
union all
select 2, ni.name||' '||coalesce(na4.address,'')||'/'||coalesce(na4.netmask,'')||' '||ni.hw_addr val
- from rhnservernetinterface,
+ from rhnservernetinterface ni,
rhnServerNetAddress4 na4
where ni.server_id = sid
and ni.id = na4.interface_id
commit ad68c72127cf80f744ba78c9ad59975f8d08a4c6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 24 14:36:25 2011 +0100
IPv6: reporting - make errata-systems report IPv6 aware
diff --git a/reporting/reports/data/errata-systems b/reporting/reports/data/errata-systems
index 41e34ae..8750703 100755
--- a/reporting/reports/data/errata-systems
+++ b/reporting/reports/data/errata-systems
@@ -14,6 +14,7 @@ columns:
profile_name Profile name, as stored on server
hostname Hostname, as reported by the system
ip_address IP address, as reported by the system
+ ipv6_address IPv6 address, as reported by the system
sql:
@@ -21,11 +22,12 @@ sql:
select rhnErrata.advisory_name as advisory,
rhnServerNeededErrataCache.server_id,
rhnServer.name as profile_name,
- rhnservernetwork.hostname, trim(rhnservernetwork.ipaddr) as ip_address
+ rhnservernetwork.hostname, trim(rhnservernetwork.ipaddr) as ip_address,
+ trim(rhnservernetwork.ip6addr) as ipv6_address
from rhnErrata, rhnServer,
rhnServerNeededErrataCache left outer join
(
- select server_id, hostname, ipaddr
+ select server_id, hostname, ipaddr, ip6addr
from rhnservernetwork
where id in (
select min(id)
12 years, 5 months
Changes to 'refs/tags/rhn-client-tools-1.6.37-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.6.37-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-11-24 15:12 +0000
Tagging package [rhn-client-tools] version [1.6.37-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhnpush-5.5.34-1:
Jan Pazdziora (2):
735346 - add space after do_call in cases like do_callpackages.checkNeedUpdate(rhnsd=1,){}.
Automatic commit of package [rhn-client-tools] release [1.6.37-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
client/rhel/rhn-client-tools/src/bin/rhn_check.py | 2 +-
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
12 years, 5 months
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3d505945b56366b2f7da21551295ff170c51ae4f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 24 16:12:35 2011 +0100
Automatic commit of package [rhn-client-tools] release [1.6.37-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 84a455d..87ffc38 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.6.36
+Version: 1.6.37
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -334,6 +334,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Thu Nov 24 2011 Jan Pazdziora 1.6.37-1
+- 735346 - add space after do_call in cases like
+ do_callpackages.checkNeedUpdate(rhnsd=1,){}.
+
* Mon Nov 21 2011 Miroslav Suchý 1.6.36-1
- 751760 - make errmsg as an alias to value (for setter too)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 9849c30..b21c38d 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.36-1 client/rhel/rhn-client-tools/
+1.6.37-1 client/rhel/rhn-client-tools/
12 years, 5 months
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/bin/rhn_check.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 742cb8677d7d747463331a4c7a777644892b52bb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 24 13:41:15 2011 +0100
735346 - add space after do_call in cases like do_callpackages.checkNeedUpdate(rhnsd=1,){}.
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn_check.py b/client/rhel/rhn-client-tools/src/bin/rhn_check.py
index da2d07d..fd748a3 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhn_check.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn_check.py
@@ -320,7 +320,7 @@ class CheckCli(rhncli.RhnCli):
@staticmethod
def __do_call(method, params, kwargs={}):
- log.log_debug("do_call", method, params, kwargs)
+ log.log_debug("do_call ", method, params, kwargs)
method = getMethod.getMethod(method, "/usr/share/rhn/", "actions")
retval = method(*params, **kwargs)
12 years, 5 months
Changes to 'refs/tags/rhnpush-5.5.34-1'
by Michael Mraka
Tag 'rhnpush-5.5.34-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-11-24 10:59 +0000
Tagging package [rhnpush] version [5.5.34-1] in directory [client/tools/rhnpush/].
Changes since spacewalk-backend-1.6.42-1:
Michael Mraka (7):
replaced external unzip with zipfile module
don't hide original error message
don't read 2GB file into memory at once
don't call os.path.join() over and over
replaced external tar with tarfile module
replaced external zip with zipfile module
Automatic commit of package [rhnpush] release [5.5.34-1].
---
client/tools/rhnpush/archive.py | 55 ++++++++++++++++++++----------------
client/tools/rhnpush/rhnpush.spec | 10 +++++-
client/tools/rhnpush/solaris2mpm.py | 21 ++++++++-----
rel-eng/packages/rhnpush | 2 -
4 files changed, 54 insertions(+), 34 deletions(-)
---
12 years, 5 months
client/tools rel-eng/packages
by Michael Mraka
client/tools/rhnpush/rhnpush.spec | 10 +++++++++-
rel-eng/packages/rhnpush | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 564a1064c01e2ed857477d53146543c5bcacb976
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 24 11:59:19 2011 +0100
Automatic commit of package [rhnpush] release [5.5.34-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 00a478e..e56af96 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -4,7 +4,7 @@ Name: rhnpush
Group: Applications/System
License: GPLv2
URL: http://fedorahosted.org/spacewalk
-Version: 5.5.33
+Version: 5.5.34
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,14 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/solaris2mpm.8*
%changelog
+* Thu Nov 24 2011 Michael Mraka <michael.mraka(a)redhat.com> 5.5.34-1
+- replaced external zip with zipfile module
+- replaced external tar with tarfile module
+- don't call os.path.join() over and over
+- don't read 2GB file into memory at once
+- don't hide original error message
+- replaced external unzip with zipfile module
+
* Wed Oct 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 5.5.33-1
- removed test for already removed object_has_attr()
- removed dead function object_has_attr()
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index f0304ba..3c15fb0 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-5.5.33-1 client/tools/rhnpush/
+5.5.34-1 client/tools/rhnpush/
12 years, 5 months