Fix package-strip-rcs-id to be more robust.

See http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg00396.html

* lisp/emacs-lisp/package.el (package-strip-rcs-id): Accept any version
string that does not signal an error in version-to-list.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 760224f601c34e409b053f70417cdbc70ac48095..0fbdd9dff76f568fb42f534b8d69f83bf3eb50b1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+       * emacs-lisp/package.el (package-strip-rcs-id): Accept any version
+       string that does not signal an error in version-to-list.
+
 2011-03-10  Michael Albinus  <michael.albinus@gmx.de>
 
        * simple.el (delete-trailing-whitespace): Return nil for the

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d90164b5a954888a2c93bb9746c73a5e9ce84aff..29089400cefa3c34cb158b56083a5a81bcfa17ae 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -848,15 +848,17 @@ The package is found on one of the archives in `package-archives'."
   ;; Try to activate it.
   (package-initialize))
 
-(defun package-strip-rcs-id (v-str)
-  "Strip RCS version ID from the version string.
+(defun package-strip-rcs-id (str)
+  "Strip RCS version ID from the version string STR.
 If the result looks like a dotted numeric version, return it.
 Otherwise return nil."
-  (if v-str
-      (if (string-match "^[ \t]*[$]Revision:[ \t]\([0-9.]+\)[ \t]*[$]$" v-str)
-         (match-string 1 v-str)
-       (if (string-match "^[0-9.]*$" v-str)
-           v-str))))
+  (when str
+    (when (string-match "\\`[ \t]*[$]Revision:[ \t]+" str)
+      (setq str (substring str (match-end 0))))
+    (condition-case nil
+       (if (version-to-list str)
+           str)
+      (error nil))))
 
 (defun package-buffer-info ()
   "Return a vector describing the package in the current buffer.