From abcbe271d5e022ac805b448c85ebe4790bae7fb1 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Mon, 12 Jan 2015 17:03:22 +0000 Subject: [PATCH] Fix ipa-restore on systems without IPA installed https://fedorahosted.org/freeipa/ticket/4824 Reviewed-By: Petr Vobornik --- ipaserver/install/ipa_restore.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index 5db65dd05..032cca9a9 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -691,8 +691,12 @@ class Restore(admintool.AdminTool): cainstance.CAInstance().stop_tracking_certificates( dogtag.configured_constants()) httpinstance.HTTPInstance().stop_tracking_certificates() - dsinstance.DsInstance().stop_tracking_certificates( - realm_to_serverid(api.env.realm)) + try: + dsinstance.DsInstance().stop_tracking_certificates( + realm_to_serverid(api.env.realm)) + except OSError: + # When IPA is not installed, DS NSS DB does not exist + pass for basename in ('cert8.db', 'key3.db', 'secmod.db', 'pwdfile.txt'): filename = os.path.join(paths.IPA_NSSDB_DIR, basename)