From 62506903101e8e8e1cfc6c70fee245f97c646844 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 29 Nov 2010 14:14:01 +1100 Subject: s4-samba-tool: fixed ldb exception handling in domainlevel command Pair-Programmed-With: Andrew Bartlett --- source4/scripting/python/samba/netcmd/domainlevel.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/scripting/python/samba/netcmd/domainlevel.py b/source4/scripting/python/samba/netcmd/domainlevel.py index 60cd844498..54a778c5fc 100644 --- a/source4/scripting/python/samba/netcmd/domainlevel.py +++ b/source4/scripting/python/samba/netcmd/domainlevel.py @@ -195,8 +195,8 @@ class cmd_domainlevel(Command): ldb.FLAG_MOD_REPLACE, "nTMixedDomain") try: samdb.modify(m) - except LdbError, (num, _): - if num != ldb.ERR_UNWILLING_TO_PERFORM: + except ldb.LdbError, (enum, emsg): + if enum != ldb.ERR_UNWILLING_TO_PERFORM: raise # Directly on the base DN @@ -215,8 +215,8 @@ class cmd_domainlevel(Command): "msDS-Behavior-Version") try: samdb.modify(m) - except LdbError, (num, _): - if num != ldb.ERR_UNWILLING_TO_PERFORM: + except ldb.LdbError, (enum, emsg): + if enum != ldb.ERR_UNWILLING_TO_PERFORM: raise level_domain = new_level_domain -- cgit