Removed override command line option

Personally, I don't see a point to a switch that must be turned on to
make all other switches work at all.  It's a confusing behaviour that
made me think I somehow broke the GUIs.

1 files changed, 1 insertions, 6 deletions

diff --git a/blather.py b/blather.py
index 5406583..6abd9fb 100755
--- a/blather.py
+++ b/blather.py
@@ -52,8 +52,7 @@ class Blather:
 
         # Merge the options with the ones provided by command-line arguments
         for k, v in opts.__dict__.items():
-            if (not k in self.options) or opts.override:
-                self.options[k] = v
+            self.options[k] = v
 
         if self.options['interface'] != None:
             if self.options['interface'] == "g":
@@ -254,10 +253,6 @@ if __name__ == "__main__":
             action="store_true", dest="pass_words", default=False,
             help="passes the recognized words as arguments to the shell command")
 
-    parser.add_option("-o", "--override",
-            action="store_true", dest="override", default=False,
-            help="override config file with command line options")
-
     parser.add_option("-H", "--history", type="int",
             action="store", dest="history",
             help="number of commands to store in history file")