scripts/pgsql-deploy.sh
by Jan Pazdziora
scripts/pgsql-deploy.sh | 59 ------------------------------------------------
1 file changed, 59 deletions(-)
New commits:
commit c986cbe9929bbf203a75d7b891ef33e819c56476
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 19 15:57:01 2011 +0100
Removing pgsql-deploy.sh, we now have spacewalk-postgresql and proper support for PostgreSQL backend in spacewalk-setup.
diff --git a/scripts/pgsql-deploy.sh b/scripts/pgsql-deploy.sh
deleted file mode 100755
index be8f780..0000000
--- a/scripts/pgsql-deploy.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-# Deploys required modified files in the pgsql git branch to live locations on the system.
-# Must be run from root of your git checkout.
-# i.e.
-# cd ~/src/spacewalk
-# SWHOST=root(a)192.168.1.45 scripts/pgsql-deploy.sh (el5|f10)
-#
-# Be careful! This script is *NOT* meant for production environments.
-
-echo "Deploying pgsql modifications..."
-echo ""
-
-if [ $# -eq 0 ]
-then
- echo "USAGE: SWHOST=root@localhost scripts/pgsql-deploy (el5|f10)"
- exit 1
-fi
-
-case $1 in
- "el5")
- echo "EL5";;
- "f10")
- echo "F10";;
- *)
- echo "Unknown arch: $1"
- exit 1;;
-esac
-
-
-if [ $1 = "f10" ]
-then
- scp ./spacewalk/setup/lib/Spacewalk/Setup.pm $SWHOST:/usr/lib/perl5/vendor_perl/5.10.0/Spacewalk/Setup.pm
- scp -r ./web/modules/rhn/RHN/ $SWHOST:/usr/lib/perl5/vendor_perl/5.10.0/
- scp -r ./web/modules/pxt/PXT/ $SWHOST:/usr/lib/perl5/vendor_perl/5.10.0/
-fi
-
-if [ $1 = "el5" ]
-then
- scp ./spacewalk/setup/lib/Spacewalk/Setup.pm $SWHOST:/usr/lib/perl5/vendor_perl/5.8.8/Spacewalk/Setup.pm
- scp -r ./web/modules/rhn/RHN/ $SWHOST:/usr/lib/perl5/site_perl/5.8.8/
- scp -r ./web/modules/pxt/PXT/ $SWHOST:/usr/lib/perl5/site_perl/5.8.8/
-fi
-
-scp ./spacewalk/setup/bin/spacewalk-setup $SWHOST:/usr/bin/spacewalk-setup
-
-scp -r ./backend/server $SWHOST:/usr/share/rhn/
-scp -r ./backend/satellite_tools $SWHOST:/usr/share/rhn/
-
-scp ./spacewalk/admin/rhn-populate-database.pl $SWHOST:/usr/bin/rhn-populate-database.pl
-
-scp ./spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf $SWHOST:/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf
-scp ./web/conf/rhn_web.conf $SWHOST:/etc/rhn/default/rhn_web.conf
-
-echo ""
-echo "PostgreSQL modifications deployed."
-echo "To undo these changes remove and re-install the following packages:"
-echo " rpm -e --nodeps spacewalk-setup spacewalk-admin spacewalk-backend-sql spacewalk-backend-tools spacewalk-config"
-echo " yum install spacewalk-setup spacewalk-admin spacewalk-backend-sql spacewalk-backend-tools spacewalk-config"
13 years, 5 months
spacewalk/admin
by Jan Pazdziora
spacewalk/admin/Makefile.admin | 1
spacewalk/admin/rhn-populate-database.pl | 144 -------------------------------
spacewalk/admin/spacewalk-admin.spec | 1
3 files changed, 146 deletions(-)
New commits:
commit 13e2ba13363b191d7480ec63c24e2463b5af0a23
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 19 15:54:08 2011 +0100
Removing rhn-populate-database.pl, we now use the generic spacewalk-sql.
diff --git a/spacewalk/admin/Makefile.admin b/spacewalk/admin/Makefile.admin
index dc55696..654155c 100644
--- a/spacewalk/admin/Makefile.admin
+++ b/spacewalk/admin/Makefile.admin
@@ -33,7 +33,6 @@ PERL_SCRIPTS = rhn-config-satellite.pl \
rhn-config-schema.pl \
rhn-deploy-ca-cert.pl \
rhn-install-ssl-cert.pl \
- rhn-populate-database.pl \
rhn-generate-pem.pl \
rhn-load-ssl-cert.pl \
rhn-sudo-load-ssl-cert \
diff --git a/spacewalk/admin/rhn-populate-database.pl b/spacewalk/admin/rhn-populate-database.pl
deleted file mode 100755
index 2d8c603..0000000
--- a/spacewalk/admin/rhn-populate-database.pl
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (c) 2008--2010 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
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# 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.
-#
-#
-# $Id$
-
-use strict;
-use warnings;
-
-use Getopt::Long;
-use English;
-use RHN::SatInstall;
-
-use File::Spec;
-use File::Copy;
-use IPC::Open3;
-use Spacewalk::Setup;
-use Symbol qw(gensym);
-
-my $usage = "usage: $0 [ --host=<databaseHost> [ --port=<port> ] ] --database=<databaseName> \\\n"
- . " --user=<username> --password=<password> --schema-deploy-file=<filename> \\\n"
- . " [ --log=<logfile> ] [ --clear-db ] [ --postgresql ] [ --help ]\n";
-
-my $user = '';
-my $password = '';
-my $database = '';
-my $host = '';
-my $port = '';
-
-my $schema_deploy_file = '';
-my $log_file;
-my $clear_db = 0;
-my $postgresql = 0;
-my $help = '';
-
-GetOptions("host=s" => \$host, "port=s" => \$port,
- "user=s" => \$user, "password=s" => \$password,
- "database=s" => \$database, "schema-deploy-file=s" => \$schema_deploy_file,
- "log=s" => \$log_file, "help" => \$help, "clear-db" => \$clear_db,
- "postgresql" => \$postgresql) or die $usage;
-
-if ($help
- or not ($user and $password and $database and $schema_deploy_file)) {
- die $usage;
-}
-
-our $lockfile = '/var/lock/subsys/rhn-satellite-db-population';
-if (-e $lockfile) {
- warn "lock file $lockfile present...database population already in progress\n";
- $lockfile = undef;
- exit 100;
-}
-
-sub clean_lockfile {
- if (defined $lockfile and -e $lockfile) {
- unlink $lockfile;
- }
-}
-$SIG{TERM} = $SIG{INT} = $SIG{QUIT} = $SIG{HUP} = \&clean_lockfile;
-END {
- clean_lockfile();
-}
-
-local * LOCK;
-if (not(open(LOCK, '>', $lockfile) and print LOCK "$$\n" and close LOCK)) {
- warn "Failed to create lock file [$lockfile]: $!\n";
- exit 101;
-}
-
-# Move the old log file out of the way - prefork to avoid race
-# condition
-if (defined $log_file and -e $log_file) {
- my $backup_file = get_next_backup_filename($log_file);
- my $success = File::Copy::move($log_file, $backup_file);
-
- unless ($success) {
- die "Error moving log file '$log_file' to '$backup_file': $OS_ERROR";
- }
-}
-
-if ($clear_db) {
- RHN::SatInstall->clear_db();
-}
-
-my @command;
-
-if ($postgresql) {
- print "*** Installing PostgreSQL schema from [$schema_deploy_file].\n";
- chdir('/');
- @command = ( 'psql', '-U', $user, '-d', $database, '-v', 'ON_ERROR_STOP=', '-f', $schema_deploy_file );
- if (defined $host) {
- push @command, '-h', $host;
- if (defined $port) {
- push @command, '-p', $port;
- }
- }
- $ENV{PGPASSWORD} = $password;
-} else {
- print "*** Installing Oracle schema from [$schema_deploy_file].\n";
- chdir('/');
- @command = ( 'sqlplus', "$user/$password\@$database", "\@$schema_deploy_file" );
-}
-
-my $pid;
-
-if (defined $log_file) {
- local *LOGFILE;
- open(LOGFILE, ">", $log_file) or die "Error writing log file '$log_file': $OS_ERROR";
- if (Spacewalk::Setup::have_selinux()) {
- system('/sbin/restorecon', $log_file) == 0 or die "Error running restorecon on $log_file.";
- }
- $pid = open3(gensym, ">&LOGFILE", ">&LOGFILE", @command);
-} else {
- $pid = open3(gensym, ">&STDOUT", ">&STDERR", @command);
-}
-
-waitpid($pid, 0);
-exit $? >> 8;
-
-sub get_next_backup_filename {
- my $log_file = shift;
- my ($vol, $dir, $filename) = File::Spec->splitpath($log_file);
- my $index = 0;
- my $backup_file;
-
- do {
- $index++;
- $backup_file = File::Spec->catfile($dir, $filename . ".$index");
- } while (-e $backup_file);
-
- return $backup_file;
-}
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index 7f99c07..446f40e 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -55,7 +55,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/validate-sat-cert
%{_bindir}/rhn-config-satellite.pl
%{_bindir}/rhn-config-schema.pl
-%{_bindir}/rhn-populate-database.pl
%{_bindir}/rhn-generate-pem.pl
%{_bindir}/rhn-sudo-load-ssl-cert
%{_bindir}/rhn-load-ssl-cert.pl
13 years, 5 months
spacewalk/setup
by Jan Pazdziora
spacewalk/setup/lib/Spacewalk/Setup.pm | 38 ++++++++++++++++++---------------
1 file changed, 21 insertions(+), 17 deletions(-)
New commits:
commit f90efd40c74fa5f331f186e7f07fa92559c783a1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 19 15:34:22 2011 +0100
Call spacewalk-sql instead of rhn-populate-database.pl.
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 98a2e35..596637e 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -907,6 +907,7 @@ sub postgresql_setup_db {
}
}
+ write_rhn_conf($answers, 'db-backend', 'db-host', 'db-port', 'db-name', 'db-user', 'db-password');
postgresql_populate_db($opts, $answers);
return 1;
@@ -951,15 +952,7 @@ sub postgresql_populate_db {
my $sat_schema_deploy = POSTGRESQL_SCHEMA_FILE;
my $logfile = DB_POP_LOG_FILE;
- my @opts = ('/usr/bin/rhn-populate-database.pl',
- sprintf('--user=%s', @{$answers}{'db-user'}),
- sprintf('--password=%s', @{$answers}{'db-password'}),
- sprintf('--database=%s', @{$answers}{'db-name'}),
- sprintf('--host=%s', @{$answers}{'db-host'}),
- sprintf('--port=%s', @{$answers}{'db-port'}),
- sprintf("--schema-deploy-file=$sat_schema_deploy"),
- sprintf('--postgresql'),
- );
+ my @opts = ('spacewalk-sql', '--select-mode-direct', $sat_schema_deploy);
print_progress(-init_message => "*** Progress: #",
-log_file_name => Spacewalk::Setup::DB_POP_LOG_FILE,
@@ -1041,6 +1034,7 @@ sub oracle_setup_db {
oracle_setup_embedded_db($opts, $answers);
oracle_setup_db_connection($opts, $answers);
oracle_test_db_settings($opts, $answers);
+ write_rhn_conf($answers, 'db-backend', 'db-name', 'db-user', 'db-password');
oracle_populate_db($opts, $answers);
}
@@ -1411,14 +1405,7 @@ sub oracle_populate_db {
File::Spec->catfile(DEFAULT_RHN_ETC_DIR, 'oracle', 'deploy.sql');
my $logfile = DB_POP_LOG_FILE;
- my @opts = ('/usr/bin/rhn-populate-database.pl',
- sprintf('--user=%s', @{$answers}{'db-user'}),
- sprintf('--password=%s', @{$answers}{'db-password'}),
- sprintf('--database=%s', @{$answers}{'db-name'}),
- sprintf('--host=%s', @{$answers}{'db-host'}),
- sprintf("--schema-deploy-file=$sat_schema_deploy"),
- );
-
+ my @opts = ('spacewalk-sql', '--select-mode-direct', $sat_schema_deploy);
if (have_selinux()) {
local *X; open X, '> ' . DB_POP_LOG_FILE and close X;
@@ -1708,6 +1695,23 @@ sub update_monitoring_ack_enqueuer {
}
}
+# Write subset of $answers to /etc/rhn/rhn.conf.
+sub write_rhn_conf {
+ my $answers = shift;
+
+ my $rhnconf = DEFAULT_RHN_CONF_LOCATION;
+ local *RHNCONF;
+ open RHNCONF, '>', $rhnconf or die "Error writing [$rhnconf]: $!\n";
+ for my $n (@_) {
+ if (defined $answers->{$n}) {
+ my $name = $n;
+ $name =~ s!-!_!g;
+ print RHNCONF "$name = $answers->{$n}\n";
+ }
+ }
+ close RHNCONF;
+}
+
=head1 DESCRIPTION
Spacewalk::Setup is a module which provides the guts of the
13 years, 5 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-sql | 40 ++++++++++++++++++++++++++++++++--------
1 file changed, 32 insertions(+), 8 deletions(-)
New commits:
commit ff0b4710b72e60f9b92f1027022d5358106ae7d9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 19 15:01:46 2011 +0100
Added --select-mode-direct option to print out the sqlplus/psql output right when we get it.
diff --git a/schema/spacewalk/spacewalk-sql b/schema/spacewalk/spacewalk-sql
index be0b5e2..d9e5fd5 100755
--- a/schema/spacewalk/spacewalk-sql
+++ b/schema/spacewalk/spacewalk-sql
@@ -8,16 +8,23 @@ use IPC::Open3 ();
use Getopt::Long ();
sub usage {
- die "Usage: $0 [--verbose] [--select-mode] sql-file-to-use.sql\n";
+ die "Usage: $0 [ OPTIONS ] sql-file-to-use.sql\n where possible OPTIONS are\n --verbose\n --select-mode or --select-mode-direct\n";
}
-my ($verbose, $select_mode);
+
+my ($verbose, $select_mode, $select_direct);
if (not Getopt::Long::GetOptions(
'verbose' => \$verbose,
'select-mode' => \$select_mode,
+ 'select-mode-direct' => \$select_direct,
)) {
usage();
}
+if ($select_mode and $select_direct) {
+ warn "Options --select-mode and --select-mode-direct are exclusive.\n";
+ usage();
+}
+
if (@ARGV != 1) {
usage();
}
@@ -79,11 +86,12 @@ if ($options{db_backend} eq 'oracle') {
die "The config file [$config_file] specifies unknown db_backend [$options{db_backend}] \n";
}
-
-my $out;
-{
-local $/ = undef;
-$out = <$rfh>;
+my $out = '';
+while (<$rfh>) {
+ if ($select_direct) {
+ print;
+ }
+ $out .= $_;
}
close $rfh;
waitpid $pid, 0;
@@ -104,7 +112,13 @@ spacewalk-sql - utility for feeding SQL to Spacewalk's database
=head1 SYNOPSIS
-B<spacewalk-sql> [ --select-mode ] [ --verbose ] sql-file-to-use.sql
+ B<spacewalk-sql> sql-file-to-use.sql
+ B<spacewalk-sql> - < sql-file-to-use.sql
+
+ B<spacewalk-sql> --verbose sql-file-to-use.sql
+ B<spacewalk-sql> --select-mode - < sql-file-to-use.sql
+ B<spacewalk-sql> --verbose --select-mode sql-file-to-use.sql
+ B<spacewalk-sql> --select-mode-direct sql-file-to-use.sql
=head1 OPTIONS
@@ -118,6 +132,16 @@ database, not do queries. With this option, upon successful
completion, the output will be printed to standard output. Note that
it will be in the native format.
+=item --select-mode-direct
+
+Variant of B<--select-mode> when the output is printed out
+immediatelly, without waiting for successful result. This is useful
+when you want to log the output and be able to watch it while
+the command runs, for example with C<tail -f>.
+
+Note that only one of B<--select-mode> and B<--select-mode-direct>
+can be specified.
+
=item --verbose
If this option is used, the command which will be invoked including
13 years, 5 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-sql | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 79ea98e743e9e373e38231cd531fa0410996fc68
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 19 14:49:47 2011 +0100
Show --verbose and --select-mode options in usage; also show usage when Getopt::Long::GetOptions fails.
diff --git a/schema/spacewalk/spacewalk-sql b/schema/spacewalk/spacewalk-sql
index cd865cf..be0b5e2 100755
--- a/schema/spacewalk/spacewalk-sql
+++ b/schema/spacewalk/spacewalk-sql
@@ -7,16 +7,19 @@ use Spacewalk::Setup ();
use IPC::Open3 ();
use Getopt::Long ();
+sub usage {
+ die "Usage: $0 [--verbose] [--select-mode] sql-file-to-use.sql\n";
+}
my ($verbose, $select_mode);
if (not Getopt::Long::GetOptions(
'verbose' => \$verbose,
'select-mode' => \$select_mode,
)) {
- exit 1
+ usage();
}
if (@ARGV != 1) {
- die "Usage: $0 sql-file-to-use.sql\n";
+ usage();
}
my $config_file = Spacewalk::Setup::DEFAULT_RHN_CONF_LOCATION;
13 years, 5 months
Changes to 'refs/tags/spacewalk-web-1.3.22-1'
by Tomas Lestach
Tag 'spacewalk-web-1.3.22-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-01-19 13:35 +0000
Tagging package [spacewalk-web] version [1.3.22-1] in directory [web/].
Changes since spacewalk-schema-1.3.12-1:
Tomas Lestach (2):
extending OS check expression
Automatic commit of package [spacewalk-web] release [1.3.22-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
13 years, 5 months
rel-eng/packages web/spacewalk-web.spec
by Tomas Lestach
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6a964b43e46015626303049e49b9fd8b25585ae2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 19 14:35:48 2011 +0100
Automatic commit of package [spacewalk-web] release [1.3.22-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 1162da3..1e12211 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.3.21-1 web/
+1.3.22-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 3129c53..bb44324 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.21
+Version: 1.3.22
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -260,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Jan 19 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.22-1
+- extending OS check expression (tlestach(a)redhat.com)
+
* Wed Jan 19 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.21-1
- adding tomcat require to spacewalk-base-minimal (tlestach(a)redhat.com)
- 670185 - rephrasing the status information to be more clear
13 years, 5 months
web/spacewalk-web.spec
by Tomas Lestach
web/spacewalk-web.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d60fa493968138ede11c5dbb44dd854c7e2d82f9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 19 14:34:44 2011 +0100
extending OS check expression
fixing add578
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 2bd8502..3129c53 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -50,7 +50,7 @@ database. This includes RHN::* and RHN::DB::*
Summary: Minimal .pm's for %{name} package
Group: Applications/Internet
Provides: spacewalk(spacewalk-base-minimal) = %{version}-%{release}
-%if (0%{?rhel} < 6) || (0%{?fedora} < 13)
+%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} < 13)
Requires: tomcat5
%else
Requires: tomcat6
13 years, 5 months
Changes to 'refs/tags/spacewalk-schema-1.3.12-1'
by Michael Mraka
Tag 'spacewalk-schema-1.3.12-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-01-19 13:04 +0000
Tagging package [spacewalk-schema] version [1.3.12-1] in directory [schema/spacewalk/].
Changes since spacewalk-web-1.3.21-1:
Michael Mraka (2):
fixed failed 1.1 -> 1.3 upgrade test
Automatic commit of package [spacewalk-schema] release [1.3.12-1].
Miroslav Suchý (1):
667739 - use accessibility tags
---
client/rhel/rhn-client-tools/data/progress.glade | 9 +
client/rhel/rhn-client-tools/data/rh_register.glade | 87 ++++++++++
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/210-rhnPackage-indexes.sql | 2
5 files changed, 103 insertions(+), 2 deletions(-)
---
13 years, 5 months
2 commits - rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/210-rhnPackage-indexes.sql | 2 ++
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 63142be334556366199d11a9d3028973ec4db32a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 19 14:04:03 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.3.12-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index dc0cfab..0443e78 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.3.11-1 schema/spacewalk/
+1.3.12-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index fb0fba3..6c6bee6 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.3.11
+Version: 1.3.12
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Jan 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.3.12-1
+- fixed failed 1.1 -> 1.3 upgrade test
+
* Tue Jan 18 2011 Jan Pazdziora 1.3.11-1
- The table rhnPackageChangelog is dropped in 103-rhnPackageChangeLog-
refactoring.sql, no need to alter it here.
commit c912220f645ceff460f431ce9074441a17108e21
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 19 14:02:07 2011 +0100
fixed failed 1.1 -> 1.3 upgrade test
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/210-rhnPackage-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/210-rhnPackage-indexes.sql
index 8433349..1488ec6 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/210-rhnPackage-indexes.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/210-rhnPackage-indexes.sql
@@ -4,6 +4,7 @@ alter table RHNERRATAFILEPACKAGE disable constraint RHN_EFILEP_PID_FK;
alter table RHNERRATAFILEPACKAGETMP disable constraint RHN_EFILEPTMP_PID_FK;
alter table RHNERRATAPACKAGE disable constraint RHN_ERR_PKG_PID_FK;
alter table RHNERRATAPACKAGETMP disable constraint RHN_ERR_PKGTMP_PID_FK;
+alter table RHNPACKAGECHANGELOGREC disable constraint RHN_PKG_CLR_PID_FK;
alter table RHNPACKAGECONFLICTS disable constraint RHN_PKG_CONFLICTS_PACKAGE_FK;
alter table RHNPACKAGEFILE disable constraint RHN_PACKAGE_FILE_PID_FK;
alter table RHNPACKAGEKEYASSOCIATION disable constraint RHN_PKEYA_PID_FK;
@@ -31,6 +32,7 @@ alter table RHNERRATAFILEPACKAGE enable novalidate constraint RHN_EFILEP_PID_FK;
alter table RHNERRATAFILEPACKAGETMP enable novalidate constraint RHN_EFILEPTMP_PID_FK;
alter table RHNERRATAPACKAGE enable novalidate constraint RHN_ERR_PKG_PID_FK;
alter table RHNERRATAPACKAGETMP enable novalidate constraint RHN_ERR_PKGTMP_PID_FK;
+alter table RHNPACKAGECHANGELOGREC enable novalidate constraint RHN_PKG_CLR_PID_FK;
alter table RHNPACKAGECONFLICTS enable novalidate constraint RHN_PKG_CONFLICTS_PACKAGE_FK;
alter table RHNPACKAGEFILE enable novalidate constraint RHN_PACKAGE_FILE_PID_FK;
alter table RHNPACKAGEKEYASSOCIATION enable novalidate constraint RHN_PKEYA_PID_FK;
13 years, 5 months