Warn instead of erroring when pruning the URL cache

* url.el (url-retrieve-internal): Warn about file errors when
pruning the cache instead of bugging out.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index e9e7a521c1ac495e2539918fc6f8254d8064dd6d..e57b5eccbc29e6ce4e0370872569f4c0f7f2aa2b 100644 (file)
--- 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 933bceb2e6f99dd25c13d21594904f2f71eaba53..5ced789e4e4450da03f7ec6d04a28308db849c24 100644 (file)
--- 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)