Pārlūkot izejas kodu

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.
Clara Hobbs 8 gadus atpakaļ
vecāks
revīzija
d722e33a35
1 mainītis faili ar 1 papildinājumiem un 6 dzēšanām
  1. 1
    6
      blather.py

+ 1
- 6
blather.py Parādīt failu

52
 
52
 
53
         # Merge the options with the ones provided by command-line arguments
53
         # Merge the options with the ones provided by command-line arguments
54
         for k, v in opts.__dict__.items():
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
         if self.options['interface'] != None:
57
         if self.options['interface'] != None:
59
             if self.options['interface'] == "g":
58
             if self.options['interface'] == "g":
254
             action="store_true", dest="pass_words", default=False,
253
             action="store_true", dest="pass_words", default=False,
255
             help="passes the recognized words as arguments to the shell command")
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
     parser.add_option("-H", "--history", type="int",
256
     parser.add_option("-H", "--history", type="int",
262
             action="store", dest="history",
257
             action="store", dest="history",
263
             help="number of commands to store in history file")
258
             help="number of commands to store in history file")

Notiek ielāde…
Atcelt
Saglabāt