summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/ipa_restore.py
diff options
context:
space:
mode:
authorTimo Aaltonen <tjaalton@debian.org>2016-03-22 21:05:39 +0200
committerMartin Basti <mbasti@redhat.com>2016-03-23 10:08:02 +0100
commit5b32ffcd1ac4bda9c34545682cc30ec4e2ec7c3b (patch)
tree0cb483d8d78d315cbd0363967ecf4b9d4a9f3ed6 /ipaserver/install/ipa_restore.py
parente45f7314e1a2276671435703e190c8dabb320739 (diff)
downloadfreeipa-5b32ffcd1ac4bda9c34545682cc30ec4e2ec7c3b.tar.gz
freeipa-5b32ffcd1ac4bda9c34545682cc30ec4e2ec7c3b.tar.xz
freeipa-5b32ffcd1ac4bda9c34545682cc30ec4e2ec7c3b.zip
ipa_restore: Import only FQDN from ipalib.constants
https://fedorahosted.org/freeipa/ticket/5619 Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaserver/install/ipa_restore.py')
-rw-r--r--ipaserver/install/ipa_restore.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index 214409e11..265653695 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -27,7 +27,8 @@ import itertools
from six.moves.configparser import SafeConfigParser
-from ipalib import api, errors, constants
+from ipalib import api, errors
+from ipalib.constants import FQDN
from ipapython import version, ipautil, certdb
from ipapython.ipautil import run, user_input
from ipapython import admintool
@@ -215,7 +216,7 @@ class Restore(admintool.AdminTool):
self.backup_dir = os.path.join(paths.IPA_BACKUP_DIR, self.backup_dir)
self.log.info("Preparing restore from %s on %s",
- self.backup_dir, constants.FQDN)
+ self.backup_dir, FQDN)
self.header = os.path.join(self.backup_dir, 'header')
@@ -278,10 +279,10 @@ class Restore(admintool.AdminTool):
self.log.info("Performing %s restore from %s backup" %
(restore_type, self.backup_type))
- if self.backup_host != constants.FQDN:
+ if self.backup_host != FQDN:
raise admintool.ScriptError(
"Host name %s does not match backup name %s" %
- (constants.FQDN, self.backup_host))
+ (FQDN, self.backup_host))
if self.backup_ipa_version != str(version.VERSION):
self.log.warning(