spacewalk/package/spacewalk.spec | 1 -
spacewalk/setup/lib/Spacewalk/Setup.pm | 8 ++++++++
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 90ce86936175c6c12f925ec1c8f166d273a0a9da
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Oct 25 15:43:09 2012 +0200
Revert "Require spacewalk-setup-embedded-postgresql for spacewalk-setup to
work."
We now check for spacewalk-setup-embedded-postgresql before running it.
This reverts commit aaa8c74a9bea8018055de624b4ead68f82e80dad.
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 5ee8404..7021213 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -138,7 +138,6 @@ Requires: postgresql84-contrib
Requires: postgresql-contrib >= 8.4
%endif
Requires: postgresql >= 8.4
-Requires: spacewalk-setup-embedded-postgresql
%description postgresql
Spacewalk is a systems management application that will
commit ffbe22c878fa84c705154e7049ba08d9493824ab
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Oct 25 15:30:37 2012 +0200
Exit if spacewalk-setup-embedded-postgresql is not installed.
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm
b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 393b744..ba0553d 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -965,6 +965,14 @@ sub postgresql_setup_embedded_db {
return 0;
}
+ if (not -x '/usr/bin/spacewalk-setup-embedded-postgresql') {
+ print loc(<<EOQ);
+The spacewalk-setup-embedded-postgresql does not seem to be available.
+You might want to use --external-db command line option.
+EOQ
+ exit 24;
+ }
+
if (-d "/var/lib/pgsql/data/base" and
! system(qq{/usr/bin/spacewalk-setup-embedded-postgresql check --db
$answers->{'db-name'}})) {
my $shared_dir = SHARED_DIR;
Show replies by date