Merge branch '1.3-stable' of deluge-torrent.org:deluge into 1.3-stable

This commit is contained in:
Damien Churchill 2012-01-09 22:34:59 +00:00
commit 2e0e0fb6b5
2 changed files with 23 additions and 13 deletions

View file

@ -747,6 +747,8 @@ class WebApi(JSONComponent):
try:
host_id, host, port, user, password = self.get_host(host_id)
except TypeError, e:
host = None
port = None
return response(_("Offline"))
def on_connect(connected, c, host_id):

8
setup.py Normal file → Executable file
View file

@ -450,6 +450,14 @@ class clean_plugins(cmd.Command):
os.remove(os.path.join(path, fpath))
os.removedirs(path)
ROOT_EGG_INFO_DIR_PATH = "deluge*.egg-info"
for path in glob.glob(ROOT_EGG_INFO_DIR_PATH):
print("Deleting %s" % path)
for fpath in os.listdir(path):
os.remove(os.path.join(path, fpath))
os.removedirs(path)
class clean(_clean):
sub_commands = _clean.sub_commands + [('clean_plugins', None)]