mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-05-03 14:54:08 +02:00
...
This commit is contained in:
parent
d00eeecd98
commit
8d1e5731d1
1 changed files with 2 additions and 2 deletions
|
|
@ -91,7 +91,7 @@ def __init__(self,
|
|||
if epilog is None:
|
||||
epilog = _('Created by ')+colored(__author__, fg='cyan')
|
||||
usage += '\n\n'+_('''Whenever you pass arguments to %prog that have spaces in them, '''
|
||||
'''enclose the arguments in quotation marks.''')+'\n'
|
||||
'''enclose the arguments in quotation marks. For example "C:\\some path with spaces"''')+'\n'
|
||||
if version is None:
|
||||
version = '%%prog (%s %s)'%(__appname__, get_version())
|
||||
optparse.OptionParser.__init__(self, usage=usage, version=version, epilog=epilog,
|
||||
|
|
@ -176,7 +176,7 @@ def merge_options(self, lower, upper):
|
|||
non default values in lower.
|
||||
'''
|
||||
for dest in lower.__dict__.keys():
|
||||
if not dest in upper.__dict__:
|
||||
if dest not in upper.__dict__:
|
||||
continue
|
||||
opt = self.option_by_dest(dest)
|
||||
if lower.__dict__[dest] != opt.default and \
|
||||
|
|
|
|||
Loading…
Reference in a new issue