sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-27 07:42:04 +03:00
Code Activity

netcmd: Add errf stream to command instances.

Browse Source
This commit is contained in:
Jelmer Vernooij
2011-10-12 23:19:12 +02:00
parent fba4b7a5b9
commit 63c9186e92
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source4/scripting/python/samba/netcmd/__init__.py
View File

@ -50,6 +50,7 @@ class Command(object):
"versionopts": options.VersionOptions,
}
outf = sys.stdout
errf = sys.stderr
def usage(self, *args):
parser, _ = self._create_parser()
@ -70,24 +71,23 @@ class Command(object):
if isinstance(inner_exception, LdbError):
(ldb_ecode, ldb_emsg) = inner_exception
print >>sys.stderr, "ERROR(ldb): %s - %s" % (message, ldb_emsg)
self.errf.write("ERROR(ldb): %s - %s\n" % (message, ldb_emsg))
elif isinstance(inner_exception, AssertionError):
print >>sys.stderr, "ERROR(assert): %s" % message
self.errf.write("ERROR(assert): %s\n" % message)
force_traceback = True
elif isinstance(inner_exception, RuntimeError):
print >>sys.stderr, "ERROR(runtime): %s - %s" % (message, evalue)
self.errf.write("ERROR(runtime): %s - %s\n" % (message, evalue))
elif type(inner_exception) is Exception:
print >>sys.stderr, "ERROR(exception): %s - %s" % (message, evalue)
self.errf.write("ERROR(exception): %s - %s\n" % (message, evalue))
force_traceback = True
elif inner_exception is None:
print >>sys.stderr, "ERROR: %s" % (message)
self.errf.write("ERROR: %s\n" % (message))
else:
print >>sys.stderr, "ERROR(%s): %s - %s" % (str(etype), message, evalue)
self.errf.write("ERROR(%s): %s - %s\n" % (str(etype), message, evalue))
force_traceback = True
if force_traceback or samba.get_debug_level() >= 3:
traceback.print_tb(etraceback)
sys.exit(1)
def _create_parser(self):
parser = optparse.OptionParser(usage=self.synopsis,