rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema-upgrade | 2 +- schema/spacewalk/spacewalk-schema.spec | 7 ++++++- schema/spacewalk/spacewalk-sql | 6 +++++- schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql | 6 ------ 5 files changed, 13 insertions(+), 10 deletions(-)

New commits: commit 2de520855c31f7beec8207d0e09e83b66c726c4d Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Dec 2 10:07:04 2011 +0100

Automatic commit of package [spacewalk-schema] release [1.6.34-1].

diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 49493a4..f4816d8 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -1.6.33-1 schema/spacewalk/ +1.6.34-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 999a12f..187b259 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.33 +Version: 1.6.34 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz

@@ -66,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql*

%changelog +* Fri Dec 02 2011 Milan Zazrivec mzazrivec@redhat.com 1.6.34-1 +- spacewalk-sql: use exec to launch psql in direct mode +- schema upgrade: run spacewalk-sql in direct mode +- pgsql schema upgrade fix + * Thu Dec 01 2011 Milan Zazrivec mzazrivec@redhat.com 1.6.33-1 - update oracle equivalent sha1 sums

commit 5fb6ef643de3e9a0f4cfda06d7897a151d688e28 Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Dec 2 10:04:49 2011 +0100

spacewalk-sql: use exec to launch psql in direct mode

This fix is to have stdout and stderr output from psql appropriately aligned.

diff --git a/schema/spacewalk/spacewalk-sql b/schema/spacewalk/spacewalk-sql index 4bba04c..0c5b169 100755 --- a/schema/spacewalk/spacewalk-sql +++ b/schema/spacewalk/spacewalk-sql @@ -90,7 +90,11 @@ EOF if ($filename eq '-') { $wfh = '<&STDIN'; } - $pid = IPC::Open3::open3($wfh, $rfh, '>&STDERR', @command) or return 2; + if ($select_direct) { + exec(@command) or die "young\n"; + } else { + $pid = IPC::Open3::open3($wfh, $rfh, '>&STDERR', @command) or return 2; + } close $wfh; } else { die "The config file [$config_file] specifies unknown db_backend [$options{db_backend}] \n";

commit 60737fa11a4bac0bdc1f18ce0187c3d6b48a2cd0 Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Dec 2 10:03:08 2011 +0100

run spacewalk-sql in direct mode

diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade index a2c1ddd..40a9c3e 100755 --- a/schema/spacewalk/spacewalk-schema-upgrade +++ b/schema/spacewalk/spacewalk-schema-upgrade @@ -243,7 +243,7 @@ system("/sbin/restorecon $logfile 2>&1 > /dev/null"); print "Executing spacewalk-sql, the log is in [$logfile].\n";

my $pid = IPC::Open3::open3(my $wfh, '>&LOG', '>&LOG', - 'spacewalk-sql', '--select-mode', "$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql") or die "Error running spacewalk-sql: $!\n"; + 'spacewalk-sql', '--select-mode-direct', "$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql") or die "Error running spacewalk-sql: $!\n"; close $wfh;

waitpid $pid, 0;

commit 1a2b4b09eefeabbf30e5247dbebeac9ec44b149d Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Dec 2 10:01:03 2011 +0100

pgsql schema upgrade: don't create the schema again

This is to avoid schema upgrade errors: ERROR: schema "rhn_server" already exists

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 f15b5c9..56dcf24 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 @@ -12,12 +12,6 @@ -- Red Hat trademarks are not licensed under GPLv2. No permission is -- granted to use or replicate Red Hat trademarks that are incorporated -- in this software or its documentation. --- --- --- --- - -create schema rhn_server;

--update pg_setting update pg_settings set setting = 'rhn_server,' || setting where name = 'search_path';