1
0
mirror of https://github.com/samba-team/samba.git synced 2025-07-29 15:42:04 +03:00

s4-s3-upgrade Do not use python 2.6 style exceptions

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Sep  9 08:54:16 CEST 2011 on sn-devel-104
This commit is contained in:
Andrew Bartlett
2011-09-09 12:44:56 +10:00
parent 25b9760a42
commit 47130f97fd

View File

@ -132,8 +132,8 @@ def import_idmap(idmapdb, samba3, logger):
try:
samba3_idmap = samba3.get_idmap_db()
except IOError as (errno, strerror):
logger.warn('Cannot open idmap database, Ignoring: ({0}): {1}'.format(errno, strerror))
except IOError, e:
logger.warn('Cannot open idmap database, Ignoring: %s', str(e))
return
currentxid = max(samba3_idmap.get_user_hwm(), samba3_idmap.get_group_hwm())