summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Garland <johnnybg+deluge@gmail.com>2010-06-08 03:19:30 +1000
committerJohn Garland <johnnybg+deluge@gmail.com>2010-06-08 03:20:48 +1000
commitf2944bdeefa139674597e8c2aea7064bb3827f5b (patch)
tree5949c62223664335dce5d1c51b53e6e3df1d2b1e
parent0fcd90ee2cc6a68d9f067c2d95843414c3eee176 (diff)
downloaddeluge-f2944bdeefa139674597e8c2aea7064bb3827f5b.tar.gz
deluge-f2944bdeefa139674597e8c2aea7064bb3827f5b.tar.bz2
deluge-f2944bdeefa139674597e8c2aea7064bb3827f5b.zip
Handle os.remove failing on windows
-rw-r--r--ChangeLog3
-rw-r--r--deluge/ui/tracker_icons.py5
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 18cf4add8..771803366 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
=== Deluge 1.3.0-rc2 (In Development) ===
+==== Core ====
+ * Fix tracker_icons failing on windows
+
==== ConsoleUI ====
* #1307: Fix not being able to add torrents
* #1293: Fix not being able to add paths that contain backslashes
diff --git a/deluge/ui/tracker_icons.py b/deluge/ui/tracker_icons.py
index 1771110c7..298e21cc0 100644
--- a/deluge/ui/tracker_icons.py
+++ b/deluge/ui/tracker_icons.py
@@ -263,7 +263,10 @@ class TrackerIcons(Component):
break
parser.close()
f.close()
- os.remove(page)
+ try:
+ os.remove(page)
+ except Exception, e:
+ log.warning("Couldn't remove temp file: %s", e)
return parser.get_icons()
def on_parse_complete(self, icons, host):