Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1303181 [ebook-device cp -f gives exits with error when trying to copy to kindle](https://bugs.launchpad.net/calibre/+bug/1303181)

Browse Source
This commit is contained in:
Kovid Goyal 2014-04-06 13:40:37 +05:30
parent b12b60da40
commit 16891b7f47
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/devices/cli.py
View File

@ -10,7 +10,6 @@ import StringIO, sys, time, os
from optparse import OptionParser from optparse import OptionParser
from calibre import __version__, __appname__, human_readable, fsync from calibre import __version__, __appname__, human_readable, fsync
from calibre.devices.errors import PathError
from calibre.devices.errors import ArgumentError, DeviceError, DeviceLocked from calibre.devices.errors import ArgumentError, DeviceError, DeviceLocked
from calibre.customize.ui import device_plugins from calibre.customize.ui import device_plugins
from calibre.devices.scanner import DeviceScanner from calibre.devices.scanner import DeviceScanner
@ -319,14 +318,7 @@ def main():
print >> sys.stderr, e print >> sys.stderr, e
parser.print_help() parser.print_help()
return 1 return 1
try: dev.put_file(infile, args[1][4:], replace_file=options.force)
dev.put_file(infile, args[1][4:])
except PathError as err:
if options.force and 'exists' in str(err):
dev.del_file(err.path, False)
dev.put_file(infile, args[1][4:])
else:
raise
infile.close() infile.close()
else: else:
parser.print_help() parser.print_help()