summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipaserver/install/ipa_restore.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index 46ac856f1..5db65dd05 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -248,11 +248,9 @@ class Restore(admintool.AdminTool):
(options.instance or options.backend)):
raise admintool.ScriptError('Restore must be in data-only mode when restoring a specific instance or backend.')
if self.backup_host != api.env.host:
- self.log.warning('Host name %s does not match backup name %s' %
+ raise admintool.ScriptError(
+ 'Host name %s does not match backup name %s' %
(api.env.host, self.backup_host))
- if (not options.unattended and
- not user_input("Continue to restore?", False)):
- raise admintool.ScriptError("Aborted")
if self.backup_ipa_version != str(version.VERSION):
self.log.warning(
"Restoring data from a different release of IPA.\n"