|
@@ -52,8 +52,7 @@ class Blather:
|
52
|
52
|
|
53
|
53
|
# Merge the options with the ones provided by command-line arguments
|
54
|
54
|
for k, v in opts.__dict__.items():
|
55
|
|
- if (not k in self.options) or opts.override:
|
56
|
|
- self.options[k] = v
|
|
55
|
+ self.options[k] = v
|
57
|
56
|
|
58
|
57
|
if self.options['interface'] != None:
|
59
|
58
|
if self.options['interface'] == "g":
|
|
@@ -254,10 +253,6 @@ if __name__ == "__main__":
|
254
|
253
|
action="store_true", dest="pass_words", default=False,
|
255
|
254
|
help="passes the recognized words as arguments to the shell command")
|
256
|
255
|
|
257
|
|
- parser.add_option("-o", "--override",
|
258
|
|
- action="store_true", dest="override", default=False,
|
259
|
|
- help="override config file with command line options")
|
260
|
|
-
|
261
|
256
|
parser.add_option("-H", "--history", type="int",
|
262
|
257
|
action="store", dest="history",
|
263
|
258
|
help="number of commands to store in history file")
|