[Emacs-diffs] /srv/bzr/emacs/trunk r107347: Warn instead of erroring when pruning the URL cache

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 107347
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2012-02-20 09:22:41 +0100
message:
  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.
modified:
  lisp/url/ChangeLog
  lisp/url/url.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-02-19 08:49:09 +0000
+++ b/lisp/url/ChangeLog        2012-02-20 08:22:41 +0000
@@ -1,3 +1,8 @@
+2012-02-20  Lars Ingebrigtsen  <address@hidden>
+
+       * url.el (url-retrieve-internal): Warn about file errors when
+       pruning the cache instead of bugging out (bug#10831).
+
 2012-02-19  Lars Ingebrigtsen  <address@hidden>
 
        * url-queue.el (url-queue-callback-function): Remove the job from

=== modified file 'lisp/url/url.el'
--- a/lisp/url/url.el   2012-02-08 00:04:42 +0000
+++ b/lisp/url/url.el   2012-02-20 08:22:41 +0000
@@ -186,7 +186,10 @@
   (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)