https://fedorahosted.org/freeipa/ticket/4683 -- David Kupka
From f5f5ae55999b2057549306331b07a3c41c0cabeb Mon Sep 17 00:00:00 2001 From: David Kupka <dku...@redhat.com> Date: Fri, 21 Nov 2014 06:30:17 -0500 Subject: [PATCH] ipa-restore: Check if directory is provided + better errors.
https://fedorahosted.org/freeipa/ticket/4683 --- ipaserver/install/ipa_restore.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index 93f176d302a49319940555a0be3037620143e1f3..c634588b5bc5a87896244166a9f8f7a571b5911f 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -152,6 +152,9 @@ class Restore(admintool.AdminTool): else: self.backup_dir = dirname + if not os.path.isdir(dirname): + raise self.option_parser.error("must provide path to backup directory") + if options.gpg_keyring: if (not os.path.exists(options.gpg_keyring + '.pub') or not os.path.exists(options.gpg_keyring + '.sec')): @@ -213,7 +216,10 @@ class Restore(admintool.AdminTool): try: dirsrv = services.knownservices.dirsrv - self.read_header() + try: + self.read_header() + except: + raise admintool.ScriptError('Cannot read backup metadata') # These two checks would normally be in the validate method but # we need to know the type of backup we're dealing with. if (self.backup_type != 'FULL' and not options.data_only and -- 2.1.0
_______________________________________________ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
