rel-eng/packages/spacewalk-web | 2 +-
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 11 +++++++++++
web/spacewalk-web.spec | 5 ++++-
3 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit bc4c46e53b01635a3f703834ec8f8b0ccadfaf9c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jun 10 14:19:21 2013 +0200
Automatic commit of package [spacewalk-web] release [1.10.26-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 5d3da33..24b6c3c 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.10.25-1 web/
+1.10.26-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 4f9cb5b..410a628 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.10.25
+Version: 1.10.26
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk/
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -272,6 +272,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Jun 10 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.26-1
+- 970146 - fix db-control examine and verify for online backups
+
* Wed Jun 05 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.25-1
- spacewalk-dobby: remove dependency on apache, spacewalk-base, spacewalk-setup
- Move RHN::SimpleStruct from spacewalk-base to spacewalk-base-minimal
commit 1879108ffc92e3f9e4847589556b2e2aaf49f433
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jun 10 14:04:03 2013 +0200
970146 - fix db-control examine and verify for online backups
diff --git a/web/modules/dobby/Dobby/CLI/BackupCommands.pm
b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
index abc31b4..3e852e1 100644
--- a/web/modules/dobby/Dobby/CLI/BackupCommands.pm
+++ b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
@@ -349,6 +349,17 @@ sub command_pg_restore {
my $backend = PXT::Config->get('db_backend');
$cli->fatal("Error: This backup method works only with PostgreSQL.")
unless ($backend eq 'postgresql');
+
+ if ($command eq 'examine') {
+ my @info = qx{/usr/bin/pg_restore -l $file};
+ @info = grep {m/^; /} @info;
+ print @info;
+ return $?;
+ } elsif ($command eq 'verify') {
+ $cli->fatal("Error: Backup verification is available only for cold
backups.");
+ return 1;
+ }
+
my $cfg = new PXT::Config("dobby");
my @rec = getpwnam($cfg->get("postgresql_user"));
$EUID = $rec[2];