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

diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 8157b457ebd0ecb7ecec852afceb9b66a346362e..41c93ea151fb632e79efcbd9b37f37fa0a1a2b7c 100644 (file)
--- 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())