[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111093: * emacs-lisp/package.el (package-untar-buffer): Handle problematic tarfile content listings.

[Chong Yidong]

------------------------------------------------------------
revno: 111093
fixes bug: http://debbugs.gnu.org/13136
author: Matt Fidler <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-12-29 18:26:14 +0800
message:
  * emacs-lisp/package.el (package-untar-buffer): Handle problematic tarfile 
content listings.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/package.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-29 08:50:27 +0000
+++ b/lisp/ChangeLog    2012-12-29 10:26:14 +0000
@@ -1,3 +1,8 @@
+2012-12-29  Matt Fidler  <address@hidden>  (tiny change)
+
+       * emacs-lisp/package.el (package-untar-buffer): Handle problematic
+       tarfile content listings (Bug#13136).
+
 2012-12-29  Mark Lillibridge  <address@hidden>
 
        * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Insert

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2012-10-28 20:41:49 +0000
+++ b/lisp/emacs-lisp/package.el        2012-12-29 10:26:14 +0000
@@ -604,7 +604,11 @@
   (require 'tar-mode)
   (tar-mode)
   ;; Make sure everything extracts into DIR.
-  (let ((regexp (concat "\\`" (regexp-quote dir) "/")))
+  (let ((regexp (concat "\\`" (regexp-quote dir)
+                       ;; Tarballs created by some utilities don't
+                       ;; list directories with a trailing slash
+                       ;; (Bug#13136).
+                       "\\(/\\|\\'\\)")))
     (dolist (tar-data tar-parse-info)
       (unless (string-match regexp (aref tar-data 2))
        (error "Package does not untar cleanly into directory %s/" dir))))