client/tools/osad/osad.spec | 5 ++++- client/tools/osad/src/osa_dispatcher.py | 6 +++--- rel-eng/packages/osad | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-)

New commits: commit 96840e641caa7005af038beedd63d635b2fb2899 Author: Jan Pazdziora jpazdziora@redhat.com Date: Fri Dec 2 13:09:45 2011 +0100

Automatic commit of package [osad] release [5.10.28-1].

diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index ff4bb06..20eb43c 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/%%7Bname%7D-%%7Bversion%7D.t... -Version: 5.10.27 +Version: 5.10.28 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 Dec 02 2011 Jan Pazdziora 5.10.28-1 +- Using password_in for parameter name to avoid confusion. + * Mon Nov 28 2011 Miroslav Suchý 5.10.27-1 - specify missing param password (mc@suse.de)

diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index c438d8f..11cb47b 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.10.27-1 client/tools/osad/ +5.10.28-1 client/tools/osad/

commit 116b246bac4b525e12f7d755e7d82a327ac4d516 Author: Jan Pazdziora jpazdziora@redhat.com Date: Fri Dec 2 13:08:06 2011 +0100

Using password_in for parameter name to avoid confusion.

Addressing File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnSQL/driver_postgresql.py", line 283, in _execute_ self._real_cursor.execute(self.sql, params) SQLStatementPrepareError: ('syntax error at or near "$1" at character 78 QUERY: insert into rhnPushDispatcher (id, jabber_id, last_checkin, hostname, port, $1 ) values (sequence_nextval(\'rhn_pushdispatch_id_seq\'), $2 , current_timestamp, $3 , $4 , $1 ) CONTEXT: SQL statement in PL/PgSQL function "rhn_asdf_03139246e715360fa7b1c85c7b9978d72cedccd8" near line 15 ', 0, "create function rhn_asdf_03139246e715360fa7b1c85c7b9978d72cedccd8 (hostname_in varchar,port_in numeric,jabber_id_in varchar,password varchar) returns void as $x03139246e715360fa7b1c85c7b9978d72cedccd8$ declare i numeric; begin 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 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); end if; end; $x03139246e715360fa7b1c85c7b9978d72cedccd8$ language plpgsql") ')

diff --git a/client/tools/osad/src/osa_dispatcher.py b/client/tools/osad/src/osa_dispatcher.py index 967c77b..21f20d7 100644 --- a/client/tools/osad/src/osa_dispatcher.py +++ b/client/tools/osad/src/osa_dispatcher.py @@ -264,14 +264,14 @@ class Runner(jabber_lib.Runner): 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); + :hostname_in, :port_in, :password_in); end if; end; """)

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 varchar' )) - h.execute(jabber_id_in=jabber_id, hostname_in=hostname, port_in=port, password=self._password) + 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) rhnSQL.commit()

_query_get_client_jids = rhnSQL.Statement("""