IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-27 16:46:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some issues introduced when rebasing update patch

Browse Source
This commit is contained in:
Rob Crittenden 2011-11-23 17:16:05 -05:00
parent 2f4b3972a0
commit fbdeda1da0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipaserver/install/ldapupdate.py
View File

@ -695,7 +695,7 @@ class LDAPUpdate:
deletes = updates.get('deleteentry', [])
for d in deletes:
try:
root_logger.info('Deleting entry %s", dn)
root_logger.info("Deleting entry %s", dn)
if self.live_run:
self.conn.deleteEntry(dn)
self.modified = True
@ -712,7 +712,7 @@ class LDAPUpdate:
if utype == 'deleteentry':
try:
root_logger.info('Deleting entry %s", dn)
root_logger.info("Deleting entry %s", dn)
if self.live_run:
self.conn.deleteEntry(dn)
self.modified = True
@ -783,7 +783,7 @@ class LDAPUpdate:
updates = None
if self.plugins:
logging.info('PRE_UPDATE')
root_logger.info('PRE_UPDATE')
updates = api.Backend.updateclient.update(PRE_UPDATE, self.dm_password, self.ldapi, self.live_run)
try:
@ -819,7 +819,7 @@ class LDAPUpdate:
if self.conn: self.conn.unbind()
if self.plugins:
logging.info('POST_UPDATE')
root_logger.info('POST_UPDATE')
updates = api.Backend.updateclient.update(POST_UPDATE, self.dm_password, self.ldapi, self.live_run)
dn_list = {}
for upd in updates:

2
ipaserver/install/upgradeinstance.py
View File

@ -106,7 +106,7 @@ class IPAUpgrade(service.Service):
self.files = ld.get_all_files(ldapupdate.UPDATES_DIR)
self.modified = ld.update(self.files)
except ldapupdate.BadSyntax, e:
logging.error('Bad syntax in upgrade %s' % str(e))
root_logger.error('Bad syntax in upgrade %s' % str(e))
self.modified = False
self.badsyntax = True
except Exception, e: