diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2011-11-23 17:16:05 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2011-11-23 00:21:03 -0500 |
| commit | fbdeda1da0349792ebde6e1756b0652832a67018 (patch) | |
| tree | 002b982851b73f215cce28f216854f9678cca245 | |
| parent | 2f4b3972a04e3ebf99ea7fd51c2b102cc8342582 (diff) | |
| download | freeipa-fbdeda1da0349792ebde6e1756b0652832a67018.tar.gz freeipa-fbdeda1da0349792ebde6e1756b0652832a67018.tar.xz freeipa-fbdeda1da0349792ebde6e1756b0652832a67018.zip | |
Fix some issues introduced when rebasing update patch
| -rw-r--r-- | ipaserver/install/ldapupdate.py | 8 | ||||
| -rw-r--r-- | ipaserver/install/upgradeinstance.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index c396dab6b..575f22421 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -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: diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index 0913fdb45..b04d92afc 100644 --- a/ipaserver/install/upgradeinstance.py +++ b/ipaserver/install/upgradeinstance.py @@ -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: |