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 #3948 (error on closing)

Browse Source
This commit is contained in:
Kovid Goyal 2009-11-06 20:33:09 -07:00
parent 52b56fe5fd
commit 7f4365e159
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/upload.py
View File

@ -303,9 +303,6 @@ class UploadInstallers(Command):
installers.append(installer_name('tar.bz2', is64bit=True)) installers.append(installer_name('tar.bz2', is64bit=True))
map(self.upload_installer, installers) map(self.upload_installer, installers)
check_call('''ssh divok echo %s \\> %s/latest_version'''\
%(__version__, DOWNLOADS), shell=True)
class UploadUserManual(Command): class UploadUserManual(Command):
description = 'Build and upload the User Manual' description = 'Build and upload the User Manual'
sub_commands = ['manual'] sub_commands = ['manual']
@ -349,6 +346,8 @@ class UploadToServer(Command):
shell=True) shell=True)
check_call('ssh divok bzr update /usr/local/calibre', check_call('ssh divok bzr update /usr/local/calibre',
shell=True) shell=True)
check_call('''ssh divok echo %s \\> %s/latest_version'''\
%(__version__, DOWNLOADS), shell=True)
check_call('ssh divok /etc/init.d/apache2 graceful', check_call('ssh divok /etc/init.d/apache2 graceful',
shell=True) shell=True)

2
src/calibre/gui2/main.py
View File

@ -750,7 +750,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
if model.location_for_row(x) == 'carda': if model.location_for_row(x) == 'carda':
self.card_a_view.write_settings() self.card_a_view.write_settings()
elif model.location_for_row(x) == 'cardb': elif model.location_for_row(x) == 'cardb':
self.carb_b_view.write_settings() self.card_b_view.write_settings()
def device_detected(self, connected): def device_detected(self, connected):
''' '''