----- Original Message -----
> From: "Michael Mraka" <michael.mr...@redhat.com>
> To: spacewalk-devel@redhat.com
> Sent: Monday, March 3, 2014 11:14:47 AM
> Subject: Re: [Spacewalk-devel] Clean up embedded Oracle related code.
>
> Hello Dimi,
>
> Although your fix is correct I'm not going to apply this patch because
> 20 lines of 21 changed are just whitespace removal. Please make a clean
> patch with only relevant change.
>
Yes, I agree and attaching clean patch.
Thank you for applying it.
>
> % From 53403e7eb5b1dbe158a39e32e6d7b360f66c19a0 Mon Sep 17 00:00:00 2001
> % From: Dimitar Yordanov <dyord...@redhat.com>
> % Date: Tue, 4 Feb 2014 15:25:49 +0100
> % Subject: [PATCH] Clean up - embedded Oracle related code
> %
> % ---
> % spacewalk/setup/lib/Spacewalk/Setup.pm | 41
> +++++++++++++++++-----------------
> % 1 file changed, 20 insertions(+), 21 deletions(-)
> %
> % diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm
> b/spacewalk/setup/lib/Spacewalk/Setup.pm
> % index 32d3e74..62d3612 100644
> % --- a/spacewalk/setup/lib/Spacewalk/Setup.pm
> % +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
> % @@ -36,7 +36,7 @@ our $VERSION = '1.1';
> %
> % use constant SHARED_DIR => "/usr/share/spacewalk/setup";
> %
> % -use constant POSTGRESQL_SCHEMA_FILE => File::Spec->catfile("/etc",
> "sysconfig",
> % +use constant POSTGRESQL_SCHEMA_FILE => File::Spec->catfile("/etc",
> "sysconfig",
> % 'rhn', 'postgres', 'main.sql');
> %
> % use constant POSTGRESQL_DEPLOY_FILE => File::Spec->catfile("/etc",
> "sysconfig",
> % @@ -376,23 +376,23 @@ sub upgrade_stop_services {
> %
> % my $spinning_callback_count;
> % my @spinning_pattern = split /\n/, <<EOF;
> % -.
> % - .
> % - o
> % - @
> % - (O)
> % - (*)
> % - ((%%))
> % - (( # ))
> % - ( ( # ) )
> % - ( ( # ) )
> % - ( ! )
> % - :
> % - .
> % - _
> % - . .
> % - . .
> % -
> % +.
> % + .
> % + o
> % + @
> % + (O)
> % + (*)
> % + ((%%))
> % + (( # ))
> % + ( ( # ) )
> % + ( ( # ) )
> % + ( ! )
> % + :
> % + .
> % + _
> % + . .
> % + . .
> % +
> % EOF
> %
> % my $spinning_pattern_maxlength = 0;
> % @@ -509,8 +509,7 @@ sub clear_db {
> %
> % print loc("** Database: Shutting down spacewalk services that may be
> using DB.\n");
> %
> % - # The --exclude=oracle is needed for embedded database Satellites.
> % - system_debug('/usr/sbin/spacewalk-service', '--exclude=oracle',
> 'stop');
> % + system_debug('/usr/sbin/spacewalk-service', 'stop');
> %
> % print loc("** Database: Services stopped. Clearing DB.\n");
> %
> % @@ -1143,7 +1142,7 @@ sub postgresql_test_db_schema {
> % return $row ? 1 : 0;
> % }
> %
> % -# Clear the PostgreSQL schema by deleting the 'public' schema with
> cascade,
> % +# Clear the PostgreSQL schema by deleting the 'public' schema with
> cascade,
> % # then re-creating it. Also delete all the other known schemas that
> % # Spacewalk might have created.
> %
> % --
> % 1.8.3.1
> %
>
> % _______________________________________________
> % Spacewalk-devel mailing list
> % Spacewalk-devel@redhat.com
> % https://www.redhat.com/mailman/listinfo/spacewalk-devel
>
>
> --
> Michael Mráka
> Satellite Engineering, Red Hat
>
> _______________________________________________
> Spacewalk-devel mailing list
> Spacewalk-devel@redhat.com
> https://www.redhat.com/mailman/listinfo/spacewalk-devel
--
Dimitar Yordanov
Systems Management QA
#satellite-qa
From 919b0f65db6561502db52721e7d71bef853859e1 Mon Sep 17 00:00:00 2001
From: Dimitar Yordanov <dyord...@redhat.com>
Date: Mon, 3 Mar 2014 13:34:24 +0100
Subject: [PATCH] Clean up - embedded Oracle related code
---
spacewalk/setup/lib/Spacewalk/Setup.pm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index b032a5c..463b9df 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -509,8 +509,7 @@ sub clear_db {
print loc("** Database: Shutting down spacewalk services that may be using DB.\n");
- # The --exclude=oracle is needed for embedded database Satellites.
- system_debug('/usr/sbin/spacewalk-service', '--exclude=oracle', 'stop');
+ system_debug('/usr/sbin/spacewalk-service', 'stop');
print loc("** Database: Services stopped. Clearing DB.\n");
--
1.8.3.1
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
