python: netcmd: catch parent exception class OptParseError instead

This covers both OptionError and OptionValueError

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/netcmd/__init__.py b/python/samba/netcmd/__init__.py
index 5360a3ed25233c930b2a7e950056a03b38969837..6d3e289285a4debeacc09848a84a1c49f9b16771 100644 (file)
--- a/python/samba/netcmd/__init__.py
+++ b/python/samba/netcmd/__init__.py
@@ -26,7 +26,7 @@ import samba
 from ldb import ERR_INVALID_CREDENTIALS, LdbError
 from samba import colour
 from samba.auth import system_session
-from samba.getopt import Option, OptionError
+from samba.getopt import Option
 from samba.logger import get_samba_logger
 from samba.samdb import SamDB
 
@@ -144,7 +144,7 @@ class Command(object):
             message = "uncaught exception"
             force_traceback = True
 
-        if isinstance(e, OptionError):
+        if isinstance(e, optparse.OptParseError):
             print(evalue, file=self.errf)
             self.usage()
             force_traceback = False