summaryrefslogtreecommitdiff
path: root/source4/scripting/bin
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-09-07 20:31:05 +0200
committerJelmer Vernooij <jelmer@samba.org>2011-09-08 00:34:22 +0200
commit4240509ebf92e53041cb8eb971802aa4d3ad8d70 (patch)
tree22012529a1f04956f15cc8827652fbae75024027 /source4/scripting/bin
parent600451da33728cbd377b122c85cf146f5b319998 (diff)
downloadsamba-4240509ebf92e53041cb8eb971802aa4d3ad8d70.tar.gz
samba-4240509ebf92e53041cb8eb971802aa4d3ad8d70.tar.bz2
samba-4240509ebf92e53041cb8eb971802aa4d3ad8d70.zip
samba-tool: Avoid use of "except .. as" construction introduced in python2.6.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Thu Sep 8 00:34:22 CEST 2011 on sn-devel-104
Diffstat (limited to 'source4/scripting/bin')
-rwxr-xr-xsource4/scripting/bin/samba-tool5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool
index c24c0e38db..7d662308a2 100755
--- a/source4/scripting/bin/samba-tool
+++ b/source4/scripting/bin/samba-tool
@@ -23,7 +23,8 @@ import sys
sys.path.insert(0, "bin/python")
from samba import netcmd
-from samba.netcmd import Command, CommandError, Option
+from samba.netcmd import Command, CommandError
+
class MainCommand(Command):
"""Main class for samba tool commands"""
@@ -73,5 +74,5 @@ if __name__ == '__main__':
try:
retval = cmd._run("samba-tool", command, *args)
sys.exit(retval)
- except Exception as e:
+ except Exception, e:
cmd.show_command_error(e)