summaryrefslogtreecommitdiff
path: root/lisp/url
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/ChangeLog5
-rw-r--r--lisp/url/url.el5
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index e9e7a521c1a..e57b5eccbc2 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-20 Lars Ingebrigtsen <larsi@gnus.org>
+
+ * url.el (url-retrieve-internal): Warn about file errors when
+ pruning the cache instead of bugging out (bug#10831).
+
2012-02-19 Lars Ingebrigtsen <larsi@gnus.org>
* url-queue.el (url-queue-callback-function): Remove the job from
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 933bceb2e6f..5ced789e4e4 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -186,7 +186,10 @@ the server."
(setf (url-use-cookies url) (not inhibit-cookies))
;; Once in a while, remove old entries from the URL cache.
(when (zerop (% url-retrieve-number-of-calls 1000))
- (url-cache-prune-cache))
+ (condition-case error
+ (url-cache-prune-cache)
+ (file-error
+ (message "Error when expiring the cache: %s" error))))
(setq url-retrieve-number-of-calls (1+ url-retrieve-number-of-calls))
(let ((loader (url-scheme-get-property (url-type url) 'loader))
(url-using-proxy (if (url-host url)