sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-21 20:23:50 +03:00
Code Activity

python/samba/emulate: Fix some more missed exception tuple assignments

Browse Source 
In python3 we need to change

    except LdbError as e:
-        (status, _) = e
to
    except LdbError as e:
+        (status, _) = e.args

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Noel Power
2018-05-09 20:17:30 +01:00
committed by Andrew Bartlett
parent d5cd9af7b5
commit 7d43571169
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
python/samba/netcmd/domain.py
View File

@@ -1715,7 +1715,7 @@ class DomainTrustCommand(Command):
if runtime is None:
return False
err32 = self._uint32(runtime[0])
err32 = self._uint32(runtime.args[0])
if err32 == val:
return True
@@ -1723,24 +1723,24 @@ class DomainTrustCommand(Command):
class LocalRuntimeError(CommandError):
def __init__(exception_self, self, runtime, message):
err32 = self._uint32(runtime[0])
errstr = runtime[1]
err32 = self._uint32(runtime.args[0])
errstr = runtime.args[1]
msg = "LOCAL_DC[%s]: %s - ERROR(0x%08X) - %s" % (
self.local_server, message, err32, errstr)
CommandError.__init__(exception_self, msg)
class RemoteRuntimeError(CommandError):
def __init__(exception_self, self, runtime, message):
err32 = self._uint32(runtime[0])
errstr = runtime[1]
err32 = self._uint32(runtime.args[0])
errstr = runtime.args[1]
msg = "REMOTE_DC[%s]: %s - ERROR(0x%08X) - %s" % (
self.remote_server, message, err32, errstr)
CommandError.__init__(exception_self, msg)
class LocalLdbError(CommandError):
def __init__(exception_self, self, ldb_error, message):
errval = ldb_error[0]
errstr = ldb_error[1]
errval = ldb_error.args[0]
errstr = ldb_error.args[1]
msg = "LOCAL_DC[%s]: %s - ERROR(%d) - %s" % (
self.local_server, message, errval, errstr)
CommandError.__init__(exception_self, msg)