[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  4240509 samba-tool: Avoid use of "except .. as" construction introduced in python2.6.
      from  600451d Fix bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking renames.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4240509ebf92e53041cb8eb971802aa4d3ad8d70
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Sep 7 20:31:05 2011 +0200

    samba-tool: Avoid use of "except .. as" construction introduced in python2.6.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Thu Sep  8 00:34:22 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/bin/samba-tool |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool
index c24c0e3..7d66230 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)


-- 
Samba Shared Repository