diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-01-12 17:03:22 +0000 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-01-13 16:28:20 +0000 |
| commit | abcbe271d5e022ac805b448c85ebe4790bae7fb1 (patch) | |
| tree | 34072182baa60c7ab7443bc08814afae83a363cd /ipaserver/install/ipa_restore.py | |
| parent | e11e8235ac9af09a587262368ef795cddbdd0e4e (diff) | |
| download | freeipa-abcbe271d5e022ac805b448c85ebe4790bae7fb1.tar.gz freeipa-abcbe271d5e022ac805b448c85ebe4790bae7fb1.tar.xz freeipa-abcbe271d5e022ac805b448c85ebe4790bae7fb1.zip | |
Fix ipa-restore on systems without IPA installed
https://fedorahosted.org/freeipa/ticket/4824
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
Diffstat (limited to 'ipaserver/install/ipa_restore.py')
| -rw-r--r-- | ipaserver/install/ipa_restore.py | 8 |
1 files 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) |