IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipa-restore: Check if directory is provided + better errors.

Browse Source 
https://fedorahosted.org/freeipa/ticket/4683

Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
David Kupka 2014-11-21 06:30:17 -05:00 committed by Tomas Babej
parent 1b5cd5b227
commit b40cf4b283
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ipaserver/install/ipa_restore.py
View File

@ -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 IOError as e:
raise admintool.ScriptError('Cannot read backup metadata: %s' % e)
# 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
@ -546,9 +552,9 @@ class Restore(admintool.AdminTool):
Read the backup file header that contains the meta data about
this particular backup.
'''
fd = open(self.header)
config = SafeConfigParser()
config.readfp(fd)
with open(self.header) as fd:
config = SafeConfigParser()
config.readfp(fd)
self.backup_type = config.get('ipa', 'type')
self.backup_time = config.get('ipa', 'time')