diff options
| author | Tomas Babej <tbabej@redhat.com> | 2014-05-29 14:47:17 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-06-16 19:48:20 +0200 |
| commit | 4d2ef43f287aa96df3d65b97977fc7a824b6b33c (patch) | |
| tree | 4adba8f39e1f874c89a73993d6a6455b649b7bb9 /ipaserver/install/upgradeinstance.py | |
| parent | c7edd7b68c98d105f02a5977a0ff7c2a3081f2c9 (diff) | |
| download | freeipa-4d2ef43f287aa96df3d65b97977fc7a824b6b33c.tar.gz freeipa-4d2ef43f287aa96df3d65b97977fc7a824b6b33c.tar.xz freeipa-4d2ef43f287aa96df3d65b97977fc7a824b6b33c.zip | |
ipaplatform: Move all filesystem paths to ipaplatform.paths module
https://fedorahosted.org/freeipa/ticket/4052
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'ipaserver/install/upgradeinstance.py')
| -rw-r--r-- | ipaserver/install/upgradeinstance.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index 85c39b554..66eafa8cc 100644 --- a/ipaserver/install/upgradeinstance.py +++ b/ipaserver/install/upgradeinstance.py @@ -22,6 +22,7 @@ import sys import shutil import random import traceback +from ipaplatform.paths import paths from ipapython.ipa_log_manager import * from ipaserver.install import installutils @@ -30,7 +31,7 @@ from ipaserver.install import schemaupdate from ipaserver.install import ldapupdate from ipaserver.install import service -DSBASE = '/etc/dirsrv/slapd-' +DSBASE = paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE DSE = 'dse.ldif' class IPAUpgrade(service.Service): @@ -53,8 +54,8 @@ class IPAUpgrade(service.Service): ext += h service.Service.__init__(self, "dirsrv") serverid = dsinstance.realm_to_serverid(realm_name) - self.filename = '%s%s/%s' % (DSBASE, serverid, DSE) - self.savefilename = '%s%s/%s.ipa.%s' % (DSBASE, serverid, DSE, ext) + self.filename = '%s/%s' % (DSBASE % serverid, DSE) + self.savefilename = '%s/%s.ipa.%s' % (DSBASE % serverid, DSE, ext) self.live_run = live_run self.files = files self.modified = False |