From 3d79e3f2fc01852bcdee324e1612685485eb883e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 2 May 2008 18:11:16 -0700 Subject: [PATCH] IGN: --- setup.py | 4 ++-- src/calibre/devices/manager.py | 2 -- src/calibre/trac/plugins/download.py | 4 ++-- upload.py | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 5bf0f0cc73..5c3591b9a6 100644 --- a/setup.py +++ b/setup.py @@ -79,10 +79,10 @@ if __name__ == '__main__': For installation/usage instructions please see http://%s.kovidgoyal.net - For source code access: bzr branch lp:%s + For source code access: bzr branch http://bzr.kovidgoyal.net/code/%s/trunk %s To update your copy of the source code: bzr merge - """%(APPNAME, APPNAME, APPNAME, APPNAME), + """%(APPNAME, APPNAME, APPNAME, APPNAME, APPNAME), license = 'GPL', classifiers = [ 'Development Status :: 4 - Beta', diff --git a/src/calibre/devices/manager.py b/src/calibre/devices/manager.py index 0ec7de6e2f..bc493d9f1a 100644 --- a/src/calibre/devices/manager.py +++ b/src/calibre/devices/manager.py @@ -8,8 +8,6 @@ Define a threaded interface for working with devices. import threading, Queue -from calibre.devices.device import Device -from calibre.devices.prs500.driver import PRS500 class DeviceManager(object): diff --git a/src/calibre/trac/plugins/download.py b/src/calibre/trac/plugins/download.py index e2fa73c238..72d6a9dc8b 100644 --- a/src/calibre/trac/plugins/download.py +++ b/src/calibre/trac/plugins/download.py @@ -9,8 +9,8 @@ from trac.web.main import IRequestHandler from trac.util import Markup -__appname__ = 'libprs500' -DOWNLOAD_DIR = '/var/www/vhosts/kovidgoyal.net/subdomains/libprs500/httpdocs/downloads' +__appname__ = 'calibre' +DOWNLOAD_DIR = '/var/www/calibre.kovidgoyal.net/htdocs/downloads' diff --git a/upload.py b/upload.py index f55efbbd1f..f098251b08 100644 --- a/upload.py +++ b/upload.py @@ -90,8 +90,7 @@ def upload_installers(): if dmg and os.path.exists(dmg): check_call('''scp %s divok:%s/'''%(dmg, DOWNLOADS)) check_call('''ssh divok chmod a+r %s/\*'''%(DOWNLOADS,)) - check_call('''ssh divok /root/bin/update-installer-links %s %s'''%(exe, dmg)) - + def upload_docs(): check_call('''epydoc --config epydoc.conf''') check_call('''scp -r docs/html divok:%s/'''%(DOCS,))