samba-tool: Improve getopt.py error handling

[ab/samba.git/.git] / source4 / scripting / python / samba / getopt.py

diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 14cfba62410d2d02545c7d88e80e728223caa2a6..7f500ec63da2d6e12a6665ea06e515cefebe3960 100644 (file)
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -77,7 +77,11 @@ class SambaOptions(optparse.OptionGroup):
         if arg.find('=') == -1:
             raise optparse.OptionValueError("--option option takes a 'a=b' argument")
         a = arg.split('=')
-        self._lp.set(a[0], a[1])
+        try:
+            self._lp.set(a[0], a[1])
+        except Exception:
+            raise optparse.OptionValueError("invalid --option option value: %s"
+                                            % arg)
 
     def get_loadparm(self):
         """Return loadparm object with data specified on the command line."""