From: Kelly Dean <kelly@prtime.org>
Date: Mon, 16 Feb 2015 04:19:41 +0000 (+0000)
Subject: emacs-lisp/package-x.el: Create valid tar files
X-Git-Tag: emacs-25.0.90~2564^2~362
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f2c4f817ee37c7c7767e22eda1c427456885b6b;p=emacs.git

emacs-lisp/package-x.el: Create valid tar files

* emacs-lisp/package-x.el (package-upload-buffer-internal):
Create valid tar files. (Bug#19536)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3da9dcaadf..d5080d92fd5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-16  Kelly Dean  <kelly@prtime.org>
+
+	* emacs-lisp/package-x.el (package-upload-buffer-internal):
+	Create valid tar files. (Bug#19536)
+
 2015-02-16  Kelly Dean  <kelly@prtime.org>
 
 	* desktop.el (desktop-read): Conditionally re-enable desktop autosave.
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index e0945d47a45..6955ce8f5a6 100644
--- a/lisp/emacs-lisp/package-x.el
+++ b/lisp/emacs-lisp/package-x.el
@@ -247,7 +247,7 @@ if it exists."
 	        	     (concat (symbol-name pkg-name) "-readme.txt")
 	        	     package-archive-upload-base)))
 
-	    (set-buffer pkg-buffer)
+	    (set-buffer (if (eq file-type 'tar) tar-data-buffer pkg-buffer))
 	    (write-region (point-min) (point-max)
 			  (expand-file-name
 			   (format "%s-%s.%s" pkg-name pkg-version extension)