From 47130f97fd371de2541be1a7216dd1ae907bfde2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 9 Sep 2011 12:44:56 +1000 Subject: s4-s3-upgrade Do not use python 2.6 style exceptions Autobuild-User: Andrew Bartlett Autobuild-Date: Fri Sep 9 08:54:16 CEST 2011 on sn-devel-104 --- source4/scripting/python/samba/upgrade.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 8157b457ebd..41c93ea151f 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -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()) -- cgit